marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,522 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

9522 Commits (73510d7fb1c600d375496374f6b23837d0033083)
 

Author SHA1 Message Date
Sven Eberhardt 923789ec49 Add PlayerStart object. 
This is an easy-to-use object for the editor which replaces Scenario.txt [PlayerX] settings.
 2016-06-08 22:15:56 -04:00
Sven Eberhardt 0bb910814d Qt Editor: Fix display and control of enum delegate parameters 2016-06-08 00:37:48 -04:00
Sven Eberhardt 5e4e6c9f7c Remove a debug log 2016-06-07 19:08:15 -04:00
Sven Eberhardt 96068b9a17 Initialize EditorBase definition with higher priority. 
Many other definitions may depend on it being initialized and it would be verbose and error-prone to add a check to every single dependent definition.
 2016-06-07 18:23:53 -04:00
Sven Eberhardt 397dbd867a Add DefinitionPriority property to control call order of Definition()-callbacks. 2016-06-07 18:22:43 -04:00
Sven Eberhardt c4dfd5e276 Add EditorProp for construction goal 2016-06-07 00:13:35 -04:00
Sven Eberhardt 3797b07f29 Add IDList EditorProp. 2016-06-07 00:13:01 -04:00
Sven Eberhardt f44cb9fa62 Qt Editor: Fix script errors on empty selection 2016-06-06 23:26:20 -04:00
Sven Eberhardt 16e31098b4 Qt Editor: Improve proplist and array display/editing 
* Add/Remove element buttons
* Display customization of user delegates
 2016-06-06 01:54:05 -04:00
Nicolas Hake 49a98e54a5 Add test for 57a35bf fix 
So it turns out that the fix stops the engine from crashing, but it
still doesn't seem to generate valid code - Aul emits an internal error
at runtime.
 2016-06-05 13:36:32 +02:00
Mark d51a8cfa6d Liquds: Liquids can be passed either as a string or as a definition 2016-06-05 12:05:48 +02:00
Mark 923ee485ec Liquid container: PutLiquid(*, nil, *) inserts maximum amount of liquid 
Added unit test.
 2016-06-05 12:05:42 +02:00
Sven Eberhardt 4d04135cda Fix GetPropertyBool default value when descending into prototype [Guenther] 2016-06-03 20:17:20 -04:00
Lukas Werling 6bd26b047f Fix typo 2016-06-03 23:18:44 +02:00
Lukas Werling 4920ed743f UPnP: Another try for Debian compatibility 2016-06-03 22:16:39 +02:00
Maikel de Vries 695680cb6c objects on fire inflame inflammable materials 2016-06-03 22:08:14 +02:00
Maikel de Vries 548215d448 make flames consume oil when burning 2016-06-03 22:08:14 +02:00
Lukas Werling 91e2c137d9 UPnP: Fix compatibility with Debian's old versions 2016-06-03 21:58:19 +02:00
Lukas Werling 55c52a69a5 Merge branch 'miniupnpc' (GH-23) 2016-06-03 17:21:20 +02:00
Sven Eberhardt b10da0629d Qt Editor: More EditorProps types (string, array) and attributes (EditOnSelection, DefaultEditorProp) 2016-06-03 01:20:43 -04:00
Maikel de Vries bb33abee2f foundry accepts water for loam production and has max liquid amount 2016-06-02 13:04:02 +02:00
Maikel de Vries e004006fdc add descriptions to liquid objects 2016-06-02 13:02:25 +02:00
Mark e1413a941d Producer: Commented out log output 
This was there for debugging purposes only.
 2016-06-01 20:42:03 +02:00
Mark 98dc6fa252 Fix Bug #1742 
Fixed and tested other problems in tutorial 3 and 4, too
 2016-06-01 20:40:26 +02:00
Mark 46ac671ef4 Fixed producers unit test #6 
The problems here were:
- the syntax for GetComponent() was wrong.
 2016-06-01 20:14:11 +02:00
Mark 10c918d4a2 Fixed producers unit test #5 
The problems here were:
- the pickaxe component list returned [[Metal, 1], [Wood, 1]] instead of [[Wood, 1], [Metal, 1]]. This may be a result of the new component system with proplists; probably the components are sorted alphabetically now
 2016-06-01 20:08:55 +02:00
Mark ffcbdc7fd0 Fixed producers unit test #7 
The problems here were:
- the foundry cannot take 400 water from ice if it has a fill limit
- the pump cannot pump anything into the object if it has no fill limit
 2016-06-01 19:10:46 +02:00
Mark ad74d44943 Foundry can be fueled by pipe. 
A pipe from a pump can be connected to a foundry now, so that oil can be pumped into the foundry.
 2016-06-01 19:10:42 +02:00
Nicolas Hake 2a59ece97c Merge pull request GH #22 
Add OpenClonk to StrategyGame and ArcadeGame categories.
 2016-06-01 10:40:12 +02:00
Lukas Werling b1b72b003a Do Linux UPnP mappings asynchronously 2016-05-31 18:23:41 +02:00
David Dormagen 092b012430 chest: stay open when empty (#1699) 
This is debatable. Let's see how this feels ingame and revert it in case we don't like it.
I like it because I think it gives valuable feedback to the players (and thus can reduce frustration coming from unnecessary actions). But it might also feel like a bug to players.
 2016-05-30 10:19:49 +02:00
David Dormagen 6696ee679c carry heavy: do not prevent scrolling through inventory (#1738) 2016-05-30 09:57:39 +02:00
David Dormagen 58bb6af75a barrel: prevent entrance of arbitrary objects 
You could put e.g. tools into the barrel using the interaction menu. This would lead to a script error later, when the barrel did Contents()->GetLiquidType().
PS: And the RejectStack function is part of a private internal interface. I made that clear so the next one does not have to look it up again.
 2016-05-30 09:56:39 +02:00
Lukas Werling dbaaec268a Change C4Network2UPnPP forward declaration to class 2016-05-29 23:39:10 +02:00
Lukas Werling 07e8c75bac Replace libupnp with miniupnpc 
- The new code works with my router while libupnp didn't. :)

 - There are some unexplainable crashes in libupnp: #1640

 - Using miniupnpc seems to be less complex than libupnp.

 - Apparently, miniupnpc also works on Windows, so we may be able to use
   it for all platforms.

Disadvantage: UPnP queries aren't asynchronous anymore, but they seem to
be pretty fast (< 1 s).
 2016-05-29 23:38:12 +02:00
Philipp Kern 672c5d3b9b Add OpenClonk to StrategyGame and ArcadeGame categories. 2016-05-29 09:39:17 +02:00
David Dormagen acde7c923a fix possible crash on cleaning up particles 
It could happen that the objects were cleared (after evaluation screen / on section change) but a particle list would remain that would still point to an object (and would then access it).
I am not exactly sure how that could happen, because objects should clear their particle lists on removal (and thus shouldn't really need a ClearPointers).
There is a tiny chance that this points to another bug somewhere in the object removal - that's just a random guess though.

Anyway, this should fix the infamous Knüppeln crash.
 2016-05-28 23:22:33 +02:00
Sven Eberhardt af2a74b6ec Qt Editor: Array editing 2016-05-28 09:30:54 -04:00
David Dormagen 2df2946016 OnInIncendiaryMaterial: check for object removal after energy loss 2016-05-27 22:19:41 +02:00
Sven Eberhardt d304b17028 Qt Editor: Editing of child proplists 2016-05-24 23:06:00 -04:00
Günther Brammer 57a35bf01b Don't crash on functions declared inside other functions 
Declaring a local variable inside any function works the same way as
declaring it in top-level scope, which gets a bit weird if done inside a
function inside a constant proplist, but is at least consistent.

Thanks to Flinti for reporting this.
 2016-05-25 01:06:10 +02:00
Sven Eberhardt 8a5dbdc73f Qt Editor: More shape prop storage options 2016-05-23 19:22:49 -04:00
Sven Eberhardt 747077b71b Qt Editor: Fix effect properties 2016-05-23 19:22:05 -04:00
Lukas Werling a71ca69f1d Make ingame mouse cursor size configurable 
On High-DPI displays, the mouse cursor is very tiny. We'll probably want
some high-resolution cursor graphics at some point, but the current ones
scale good enough.
 2016-05-23 21:14:03 +02:00
Lukas Werling 435fe98b71 SDL: Handle key repeats 2016-05-22 23:27:57 +02:00
Maikel de Vries fb60bf41b8 remove spurious comment in flagpole script 2016-05-21 13:34:35 +02:00
Maikel de Vries 3455fa24f9 add some variation to the maximum size of trees 2016-05-21 13:34:34 +02:00
Maikel de Vries 18f2b4831a add max size option to StartGrowth 2016-05-21 13:34:34 +02:00
Maikel de Vries e92e7a2e2c fix producer components call after liquid_container branch merge 2016-05-21 13:34:34 +02:00
Maikel de Vries 6c8c4c9c19 allow more components than def for Oversize objects 2016-05-21 13:34:34 +02:00