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

9491 Commits (450619bac8331c33ee71a55dec0f1d1aaf76f324)
 

Author SHA1 Message Date
Martin Plicht 450619bac8 C4WindowController.mm: Only implement some viewport methods if not defined by qt editor implementation somewhere 2016-07-23 18:16:28 +02:00
Martin Plicht 2cfd743777 C4WindowMac.mm: Define some dummy K_* constants which weren't defined before for Cocoa 2016-07-23 18:16:28 +02:00
Martin Plicht 9dbe734f17 CMakeLists.txt: mac: Throw in some -headerpad_max_install_names because Xcode told me so 2016-07-23 18:16:28 +02:00
Sven Eberhardt 5bfd2b87c5 Qt Editor: Reorder array editing buttons below property action buttons 2016-07-23 02:34:08 -04:00
Sven Eberhardt 91873ca0ac Add graphics for sequence 2016-07-23 01:44:32 -04:00
Sven Eberhardt 1f3e457ec2 Qt Editor: Fix enum child delegate value setting if a Set path is defined on the parent proplist 2016-07-23 01:40:51 -04:00
Sven Eberhardt 58faf41068 Sequence: Add more triggers. 
* Player enters circular region
* Game starts (after player joins)
* Player joins
* Player removed
* All goals fulfilled
* Clonk death
* Construction of structure
* Production of item
 2016-07-22 01:51:29 -04:00
Sven Eberhardt 14d01cd5cd Qt Editor: Add EmptyName option for def property to rename the "nil" entry 2016-07-22 00:28:01 -04:00
Sven Eberhardt f4ea3359d0 Add InitializePlayers callback after all initial players have joined 2016-07-22 00:13:57 -04:00
Sven Eberhardt 319392a779 UserAction: Rename OptionKey from Option to Function 2016-07-21 00:47:43 -04:00
Sven Eberhardt 626719194a Add trigger+action to sequence object. 
Sequences can be used to create triggered cutscenes, intros, outros, etc. in the future.
 2016-07-21 00:24:55 -04:00
Sven Eberhardt 5855140cd4 UserAction: Conditions and more triggering player/object options 2016-07-21 00:24:54 -04:00
Sven Eberhardt b915ecc32a Clonk AI EditorProp using SetGlobal 2016-07-21 00:24:53 -04:00
Sven Eberhardt 4fad947980 Qt Editor: Add Set function options SetGlobal and SetRoot 2016-07-21 00:24:53 -04:00
Sven Eberhardt 16a770703a Add IsEditor script function 
Returns if the host is running in editor (not adjusted in savegames).
 2016-07-21 00:24:52 -04:00
Lukas Werling 513d51384f Fix nullptr -> bool conversion in return value 
GCC does not like this, although both MSVC and clang accept it.
 2016-07-19 17:21:23 +02:00
Sven Eberhardt 42e142b4d7 Qt Editor: Fix shape delegates as parameters to enum delegates 2016-07-18 19:24:53 -04:00
Sven Eberhardt 68358c0f87 Qt Editor: Improve display of object delegate 2016-07-14 00:45:18 -04:00
Sven Eberhardt 1151016b56 Add dialogue target editor prop 2016-07-14 00:45:00 -04:00
Sven Eberhardt d605bab0be Qt Editor: Move EditorActions from EditorAction_* to a proplist EditorAction.* 2016-07-14 00:17:53 -04:00
Sven Eberhardt 656aa303f9 Ignore SetAI(..., true) if an AI already exists 
Can happen e.g. in multiplayer editing
 2016-07-13 22:15:55 -04:00
Sven Eberhardt 5a9e608f55 Qt Editor: Do not show properties of dead effects 2016-07-13 22:14:28 -04:00
Sven Eberhardt 59712bcea0 Qt Editor: Fix display of effect properties 2016-07-13 22:02:18 -04:00
Sven Eberhardt 8d6a7058c6 Fix possible user action sequence id conflict when saving scenario after testing a sequence 2016-07-13 17:39:36 -04:00
Sven Eberhardt 28d2172b78 Qt Editor: Move editor props from EditorProp_* to an EditorProp proplist 2016-07-13 17:18:08 -04:00
Sven Eberhardt f780a55e0f Add dialogue UserActions to enable/disable dialogue and attention marker 2016-07-13 02:17:56 -04:00
Sven Eberhardt 7a6ced04c5 UserAction: Add const object and bool evaluators 2016-07-13 02:17:12 -04:00
Sven Eberhardt 22328365fa Escape \ and " characters when scenario saving names and strings within proplists 2016-07-13 02:13:23 -04:00
Sven Eberhardt d9f31b006b Add ReplaceString script function 2016-07-13 02:12:31 -04:00
Sven Eberhardt 279d89393c SaveScenario: Correctly save object pointers within proplist 2016-07-13 01:45:29 -04:00
Sven Eberhardt dfb709df6b Qt Editor: Do not reset value to default parameter when re-selecting an already selected index 2016-07-12 23:28:51 -04:00
Sven Eberhardt 3c84f9e6f8 Qt Editor: Fix evaluation of ValueKey in enum option when changing child delegate value 2016-07-12 22:29:24 -04:00
Sven Eberhardt 097ff2c9fb Moved ConstructionSite from libraries to structures 
This makes it more accessible in the editor. Otherwise, there would be "libraries/constructor" folders in the object creator with the construction site as the only contained definition.
 2016-07-10 22:10:49 -04:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Sven Eberhardt 0206e9a74a Qt Editor: Add HideInCreator DefCore setting 
Hides internal definitions, libraries, etc. from the object creator in the editor.
 2016-07-10 21:55:56 -04:00
Sven Eberhardt d3ede324be EditorBase: Publish some properties 2016-07-10 16:09:37 -04:00
Sven Eberhardt d2fd1d740e Add EditorProps to create NPC dialogues in the editor 2016-07-10 14:11:23 -04:00
Sven Eberhardt 85c5deb099 Qt Editor: Add option to auto-select objects created by an EditorAction 
To be used by the dialogue so you can press a button on the clonk to add and immediately configure a dialogue.
 2016-07-07 01:36:58 -04:00
Sven Eberhardt d717e41902 Add user actions to SpinWheel up and down events 2016-07-06 01:04:45 -04:00
Sven Eberhardt d3be591d8d Add "Message" UserAction 2016-07-06 01:03:46 -04:00
Sven Eberhardt 5c6da07c51 Add UserAction scripted editor property delegates 
UserActions will be used to click small dialogues and scripts directly in the editor.
 2016-07-06 01:03:02 -04:00
Sven Eberhardt 990b6ea8f1 Qt Editor: Add option to descend directly into a subpath from array and sequence property delegates 2016-07-06 00:56:08 -04:00
Sven Eberhardt 8bc5e1911d Qt Editor: When descending into array delegates, use the parent name as header. 2016-07-05 23:27:55 -04:00
Sven Eberhardt 343658db96 Fix MSVC build 
Not sure why this builds elsewhere.
 2016-07-05 22:54:19 -04:00
Sven Eberhardt 63c9bd78e7 Qt Editor: Fix crash and prop list/array display problems when switching prop lists. 
Storing the pointer in QModelIndex could sometimes keep invalid memory on the persistent model indices. Because re-organizing these memory locations would be a nightmare and we only go two levels deep anyway, just store the parent index in the internal pointer and look up the actual property on the fly.
 2016-07-05 22:53:41 -04:00
Sven Eberhardt 162a7cb331 Qt Editor: Resolve child delegates when evaluating proplist delegate display value 2016-07-04 13:21:31 -04:00
Sven Eberhardt 62c1f4bda5 Qt Editor: Add callback support for dynamic enum values in Enum delegates 2016-07-04 13:21:30 -04:00
Sven Eberhardt cfca3be7e2 Qt Editor: Fix log output widget settings 
Make text non-editable, etc.
 2016-07-04 13:21:29 -04:00
Lukas Werling 8ab5d35550 Fix crash due to invalid QApplication arguments 
It would trigger on Linux when opening menus.
 2016-06-30 22:23:21 +02:00
Lukas Werling 440751691d Fix build with CMake >= 3.1.0 and Qt 5.7 2016-06-26 16:57:26 +02:00