Sven Eberhardt
bce903ee04
Merge branch 'master' into qteditor
...
Conflicts:
planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
2016-08-13 23:42:59 -04:00
Lukas Werling
abef0da0aa
Fix RestartApplication on Linux
...
(and hopefully don't break it on Windows)
2016-08-11 22:11:15 +02:00
Sven Eberhardt
4869eff787
Allow joining to editor games through startup network dialogue
2016-08-10 19:35:39 -04:00
Lukas Werling
4f5ba57170
Allow scenario saving as editor client
2016-08-09 18:55:43 +02:00
Sven Eberhardt
9d715387f2
Qt editor: Store and restore window layout (docked dialogues, etc.)
2016-08-08 23:57:24 -04:00
Sven Eberhardt
60240ac05b
Qt editor: Fix material size slider when adjusting with a method other than dragging
2016-08-08 17:39:10 -04:00
Sven Eberhardt
4581022411
Fix an aul preparser crash on DirectExec functions parsing
...
GetLastRetType doesn't work because the preparser does not generate code.
The code looks a bit like this line just got lost somehow?
2016-08-08 15:26:25 -04:00
Lukas Werling
ec128bede4
Qt editor: Fix freeze during lobby and loading on Linux
2016-08-08 17:24:44 +02:00
Sven Eberhardt
4c349b8c17
Qt editor: Fix enum parameter delegate initial value assignment
2016-08-07 23:42:41 -04:00
Lukas Werling
05d5d128c7
Qt editor: Disable scoreboard windows to fix Linux crash
...
These windows should be reimplemented as Qt windows.
2016-08-08 00:32:31 +02:00
Sven Eberhardt
eafa2e9305
Fix game coordinates for keyboard controls that request a cursor pos
2016-08-07 18:03:56 +02:00
Sven Eberhardt
231a0ba9b4
Send mouse coordinates directly with control if SendCursorPos is true
2016-08-07 18:03:55 +02:00
Sven Eberhardt
159d0811d6
Fix game coordinates for keyboard controls that request a cursor pos
2016-08-07 11:08:42 -04:00
Sven Eberhardt
e5c6ca990b
Send mouse coordinates directly with control if SendCursorPos is true
2016-08-07 10:48:54 -04:00
Sven Eberhardt
08d2e3f521
Qt editor: Fix material selection sorting and remove duplicates
2016-08-07 10:33:21 -04:00
Sven Eberhardt
39cfd4a0fe
Fix non-editor build (this time for real!)
2016-08-07 02:18:01 -04:00
Sven Eberhardt
0b5e8723c2
Fix non-editor build
2016-08-07 01:42:29 -04:00
Sven Eberhardt
3a6a7aceaa
Qt editor: Fix object selection on EditorAction in network
2016-08-07 01:13:24 -04:00
Sven Eberhardt
62fb460180
Qt editor: Make completer in script input box case sensitive
2016-08-06 23:54:47 -04:00
Sven Eberhardt
5c70c2aa42
Qt editor: Fix viewport titles and decorations
...
The custom title bar caused a lot of problems. Particularly turning it on and off between docked and undocked modes caused some internal trouble with the rendering going off. It also didn't have a close button.
Fortunately, the desired font and highlight effect of selected viewports can also be achieved with style sheets on the dock.
2016-08-06 23:39:44 -04:00
Sven Eberhardt
769fa0fbdc
Do not auto-deactivate clients without players in editor
2016-08-06 22:05:25 -04:00
Sven Eberhardt
5db45c0f47
Merge branch 'master' into qteditor
2016-08-06 21:45:19 -04:00
Sven Eberhardt
40abe71a8c
Qt editor: Better placement of PlayerStart object in new scenario
2016-08-06 21:29:26 -04:00
Sven Eberhardt
3553cd54b5
Qt editor: Allow creation of larger map in new scenario
2016-08-06 21:29:09 -04:00
Sven Eberhardt
a7fffcfd77
Qt editor: Clear definition list on game close
2016-08-06 21:19:24 -04:00
Sven Eberhardt
b6e45daa24
Qt editor: Enable play button to start game in lobby
2016-08-06 21:16:28 -04:00
Sven Eberhardt
5bb204d69b
Qt editor: Fix net menu
...
It didn't work, had the wrong labels and crashed.
2016-08-06 21:12:04 -04:00
Sven Eberhardt
c0f95d97f7
Fix net menu popping up out of nowhere all the time
2016-08-06 20:29:15 -04:00
Sven Eberhardt
6dc4cb7f1d
Remove some outdated todo comments in C4ConsoleQt
2016-08-06 20:28:50 -04:00
Sven Eberhardt
20eaaa97b3
Fix chatting in editor lobby
2016-08-06 20:22:33 -04:00
Sven Eberhardt
1c90f9b2da
Do not abort network round due to insufficient player count in editor mode
2016-08-06 15:45:56 -04:00
Sven Eberhardt
c78a98d4b3
Fix crash on uninitialized pointer in Qt GL window initialization
2016-08-06 15:22:58 -04:00
Sven Eberhardt
fc24969899
Add EditorPlacementLimit property
...
Limits the number of object instances that can be placed of a given def.
2016-08-06 02:36:53 -04:00
Sven Eberhardt
a14f8597d2
Qt editor: Fix AsyncGet on bool delegate
2016-08-05 01:00:33 -04:00
Sven Eberhardt
6bd6c07195
Qt editor: Remove some debug logging
2016-08-04 22:22:14 -04:00
Sven Eberhardt
bce09d272d
Add EditorInitialize callback
2016-08-04 22:12:10 -04:00
Lukas Werling
b7359e0c27
Remove the GTK platform (USE_GTK)
...
The GTK code does not work with the Qt editor. The simpler SDL2 platform
does, so we have little reason to keep the GTK code.
Note that GTK is still a dependency for mape.
Discussion: http://forum.openclonk.org/topic_show.pl?tid=3328
2016-08-03 16:25:46 +02:00
Sven Eberhardt
24a5dc33db
Qt editor: Sort properties in property list by localized name and priority
2016-08-02 01:12:08 -04:00
Sven Eberhardt
1d566ec6c5
Add VIS_Editor visibility flag
2016-08-02 01:12:08 -04:00
Lukas Werling
582c82c159
Qt editor/Linux: Fix crash on player removal
...
See 69fff71abf
2016-08-01 13:54:35 +02:00
Sven Eberhardt
e5f2e4e58a
Fix StdBuf::Compare with iAt>0
...
This caused the clonk to sometimes walk in the air when jumping.
2016-08-01 00:37:19 -04:00
Sven Eberhardt
69fff71abf
Qt editor: Fix crash on player removal
2016-07-31 23:22:09 -04:00
Sven Eberhardt
d1e8bc39c5
Qt Editor: Fix enum property delegate option value lookup for undefined options
2016-07-31 10:35:15 -04:00
Sven Eberhardt
b1a1df8dee
Add eval parameter to not pass errors
2016-07-31 08:15:54 -04:00
Sven Eberhardt
18444c7e0d
Add StringToIdentifier script function
...
Required to sanitize variables in the editor. Works by stripping all non-identifier characters and preprending a _ if necessery.
2016-07-30 21:43:01 -04:00
Sven Eberhardt
442b8e66df
Qt Editor: Add short name for enum delegate options displayed as sub-delegate
2016-07-30 14:50:07 -04:00
Sven Eberhardt
d55c988d2e
Qt Editor: Support EmptyName enum delegate property for user-defined option lists
...
This can be used to clarify what happens e.g. when nil is selected in an object function delegate.
2016-07-30 14:13:23 -04:00
Sven Eberhardt
8840105f6c
Qt editor: Auto-dropdown child enums on creation
2016-07-30 02:37:33 -04:00
Sven Eberhardt
affa2aebb0
Qt Editor: Add point property delegate
2016-07-30 01:05:12 -04:00
Sven Eberhardt
37885a2e4f
Qt Editor: Add AllowEditing flag for enum delegates.
...
Used for sound delegate
2016-07-28 00:24:28 -04:00