Julius Michaelis
64dd72c380
Fix dedicated: Load JPEG surfaces so the texture shape information can be correctly generated
2016-10-30 21:36:29 +01:00
Lukas Werling
63cc42e967
Improve script shader code
...
- Avoid std::list.
- Don't pass strings and vectors by value.
- Don't try to update script shader slices as they never change.
2016-10-30 12:06:01 +01:00
Julius Michaelis
29b5fa5946
Fix include: no "src/"
2016-10-30 01:21:44 +02:00
Lukas Werling
13fa0ab7b1
Implement adding/removing shaders from script
...
New script functions: AddFragmentShader, RemoveShader.
There is currently no support for adding vertex shaders.
2016-10-29 21:19:08 +02:00
Julius Michaelis
9ab410e47d
SDL: Notify C4Application of resolution / window size changes.
2016-10-29 14:15:09 +02:00
Nicolas Hake
bce0b45413
Editor: Fix scheduler timer so it doesn't busy wait ( #1834 )
...
36/1000 is always 0 and doesn't make a lot of sense anyway. Use 1000/36
(aka 1000ms/36fps) instead so the UI thread has some time to rest.
Also use a Qt::PreciseTimer so Qt doesn't try to coalesce the scheduler
timer with other timers to save energy.
2016-10-28 21:31:14 +02:00
Sven Eberhardt
f2231e848e
AulCompiler: Fix static parameter type check
2016-10-24 22:00:30 -04:00
Julius Michaelis
e61dcbe4c3
Extend the netpuncher: clients can ask hosts for a connection initiation to circumvent port restricted NATs
2016-10-23 22:34:43 +02:00
David Dormagen
c2f391e565
editor: don't crash on selecting object when EditorBase doesn't have member EditorProps
...
This crash happened for me in a custom scenario but with unmodified original objects. No idea why, but it seemed defective anyway.
2016-10-23 18:47:44 +02:00
Julius Michaelis
376ca5a9df
Prevent using USE_CONSOLE in lib{misc,c4script}
2016-10-22 17:42:23 +02:00
Lukas Werling
e7f4105b97
Replace duplicate BreakMessage() implementations
...
...with a single one based on std::string in the hope of getting rid of
StdStrBuf some day.
2016-10-22 17:00:20 +02:00
Nicolas Hake
cada67c097
Prohibit overriding local vars with functions ( #1831 )
...
The old parser threw a standard compile error in this case; the
AST-based parser threw an ICE, which is ultimately the same thing but
made it sound like the parser was at fault. And maybe it is, and we
should allow code like "local a; func a() {}" but that seems like it
should be a conscious design decision.
2016-10-21 22:32:24 +02:00
Julius Michaelis
8d2f2846b5
Fix mac build
...
Also move some stuff around once again…
2016-10-21 01:25:48 +02:00
Julius Michaelis
5b7c5b48ee
Fix mape and mac build
...
Attempt #1 .
2016-10-20 20:36:52 +02:00
Julius Michaelis
34a9a1de8d
Twiddle with header organization: lib{misc,c4script} do no longer include GL/glew.h
...
(Yes, it is just that complicated.)
2016-10-20 18:46:32 +02:00
Nicolas Hake
e2fd7095c1
Merge branch 'ast'
...
# Conflicts:
# src/C4Include.h
# src/script/C4AulCompiler.cpp
# src/script/C4AulParse.cpp
# src/script/C4AulParse.h
# src/script/C4ScriptHost.cpp
# src/script/C4ScriptHost.h
# tests/CMakeLists.txt
2016-10-20 17:33:02 +02:00
Nicolas Hake
266feeda4d
Aul: Add AST generation tests
...
Just making sure the parser creates the AST the way we expect before we
hand off the code to the codegen.
2016-10-20 17:20:55 +02:00
Nicolas Hake
118961d0b7
Aul: fix octal escape parsing
...
Bet you didn't know C4Script supported octal escapes inside strings.
Well, it didn't; or at least not correctly.
2016-10-20 16:53:23 +02:00
Nicolas Hake
5915f79960
Don't entirely recreate global vars in second compile pass
...
This allows people to properly cross-reference two proplists from each
proplist's initializer.
2016-10-19 14:20:48 +02:00
Nicolas Hake
021a6e89f5
Implement direct execution of whole function definitions
...
This implements the changes made in c6e4bfd
on the AST-based parser.
2016-10-19 14:20:47 +02:00
Nicolas Hake
1a8db9e109
Make C4ScriptHost store C4Value refs to owned functions
...
C4Value already handles refcounting properly for us, so we don't need to
do it manually. It might still be worth manually refcounting them
to avoid the boxing/unboxing overhead, but it's only needed at load and
unload so it's not a priority at the moment.
2016-10-19 14:20:46 +02:00
Nicolas Hake
5f3dbdd417
Reject function expressions inside proplists inside functions
...
These aren't supported by the codegen on account of not working in
savegames.
2016-10-19 14:20:45 +02:00
Nicolas Hake
9caaf1e298
Aul: Split out error handling into a separate class for easier testing
...
By using an extern error handler in the script engine, we can mock that
handler and make sure something that should fail actually does, instead
of having to parse log messages.
2016-10-19 14:20:41 +02:00
Nicolas Hake
b2d5164a0f
Remove re namespace alias
...
This alias is a legacy from when we were using Boost.Regexp to
workaround a broken implementation in GCC's libstdc++ earlier than 4.9.
2016-10-19 13:46:03 +02:00
Nicolas Hake
a188500609
Remove MS CRT memory management debugging
...
Redefining new breaks perfectly valid code, but only on MSVC and only in
one particular configuration (Debug). This is very annoying because it
means people not using MSVC, or even people doing Release builds, can
write standards-conforming code which then may fail to build for other
people.
2016-10-19 13:46:01 +02:00
Nicolas Hake
f7a04624eb
Remove references to functions defined in unloading defs ( #1776 )
2016-10-19 13:45:59 +02:00
Nicolas Hake
ab1e6bd5a4
Allow proplist-local funcs to access vars of their owner's prototype
...
Thanks to JCaesar for providing this test case.
2016-10-19 13:45:35 +02:00
Nicolas Hake
1b32633806
Add C4LangStringTable::system_string_table def'n to standalone stubs
2016-10-16 20:11:13 +02:00
Armin Burgmeier
2362a73e60
FnSetSky: open Graphics.ocg before re-loading sky ( #1827 )
...
Needed to load shader slices in C4Sky::Init.
2016-10-16 10:04:54 -07:00
Armin Burgmeier
8f61918219
Initialize graphics when re-loading sky ( #1827 )
...
Need this so that C4Sky::Init can read the shaders.
2016-10-16 10:04:54 -07:00
Nicolas Hake
8f47edc1e3
Fix destruction order of system string table vs. editor
...
Depending on the mood of the linker, the editor may have been
constructed before and destroyed after the system-wide string table
because they weren't defined in the same file. Destruction of the editor
tries to load some strings, which would then access the already
destroyed string table and thus crash.
2016-10-16 18:40:51 +02:00
Sven Eberhardt
24c386c67f
Editor: Fix recent scenario display on welcome page if a recent entry was opened via path including Scenario.txt
...
Always show the name of the enclosing .ocs file.
2016-10-16 09:52:48 -04:00
Sven Eberhardt
cd9d6f5c6f
Editor: Show full path name in sound delegate display string
2016-10-16 01:15:38 -04:00
Sven Eberhardt
38cf275de7
Editor: Implement saving of editable enum delegates
2016-10-16 01:12:21 -04:00
Sven Eberhardt
386f178568
Editor: Auto-focus enum child editors for int, string, color and any types
2016-10-15 18:26:03 -04:00
Sven Eberhardt
028b576ab3
Editor: Change initial tool to "object edit"
2016-10-15 11:43:55 -04:00
Sven Eberhardt
c44a776090
Editor: Fix object list update on object removal
2016-10-15 11:43:12 -04:00
Sven Eberhardt
978afbc4a2
Editor: Focus object script box on double-clicking item in object list
2016-10-15 10:39:33 -04:00
Sven Eberhardt
d24afbe835
Editor: Fix display of non-object properties
...
Fixes property display of definitions, Global and Scenario.
2016-10-15 10:06:44 -04:00
Sven Eberhardt
06a438e05e
Editor object list: Remove effects; add Global and Scenario
2016-10-15 10:06:44 -04:00
Sven Eberhardt
4b3f8c0fef
Remove EditCursorSelection and EditCursorDeselection callbacks
...
They never worked properly in network mode because all users would see the changes.
EditorProps, EditorActions and shape delegates now provide the functionality to have custom object editing widgets.
This also fixes a bug with the selection callback causing the object list to act up.
2016-10-15 10:06:43 -04:00
Lukas Werling
59b5525a41
Rework sky definition parsing
...
This also adds a broken SetSky() script function which was the main
motivation for the rework. See #1827
2016-10-15 13:34:39 +02:00
Sven Eberhardt
15d850e4ec
Editor: Add effects to property viewer
2016-10-14 10:50:17 -04:00
Nicolas Hake
66d5ef8b08
Reset codegen target after parsing nested function
...
Parsing a function expression inside another function failed to reset
the code generator target to the containing function, so all following
bytecode would still be appended to the nested function, leaving the
container broken.
2016-10-12 14:56:54 +02:00
Nicolas Hake
d9696d2f88
Reorder game cleanup
...
The order in which game components were cleaned up seemed rather
arbitrary, so let's change that into blocks of reasonably connected
parts.
2016-10-11 19:44:29 +02:00
Nicolas Hake
14bfd7ea59
Clear console pointers earlier
...
It doesn't make a lot of sense to keep console pointers around while the
objects and scripts have already been deleted. Clear them earlier so we
don't have any dangling pointers.
2016-10-11 19:44:27 +02:00
Lukas Werling
170a793a44
Windows: Only write to stdout if there is no debugger
2016-10-11 18:07:31 +02:00
Sven Eberhardt
510d91fd00
Editor: Allow movement of HorizontalFix items by holding Shift and on object duplication
2016-10-10 21:46:17 -04:00
Sven Eberhardt
5e4aefddb2
Editor: Fix Ctrl+Click in object creation mode to create contents
2016-10-10 21:35:04 -04:00
Sven Eberhardt
4eae2b28d7
Editor: Fix drop cursor drawing
2016-10-10 21:26:10 -04:00
Sven Eberhardt
d670291aba
Implement tool tips for EditorActions
2016-10-10 16:45:23 -04:00
Sven Eberhardt
20d234e324
Editor: Replace | by line breaks in descriptions and EditorHelp texts
2016-10-10 16:45:22 -04:00
Nicolas Hake
a6b65f0dee
Merge pull request GH #28 from aburgm:fix-proplist-leak
...
Don't leak static proplists with cyclic references
2016-10-10 19:32:30 +02:00
Lukas Werling
f5613c350e
Windows: Write console output to stdout
...
This is useful for third-party editor UIs.
See http://forum.openclonk.org/topic_show.pl?tid=3344
2016-10-10 16:03:49 +02:00
Lukas Werling
4d5bb7304c
Fix game controllers not working with the editor
2016-10-10 14:16:18 +02:00
Sven Eberhardt
5e3730fc3e
Editor: Store+Restore maximized state
2016-10-08 20:53:01 -04:00
Sven Eberhardt
765648877f
Editor: Fix window shutdown to correctly save editor geometry even if quitting via Application.Quit (e.g. Ctrl+Q)
2016-10-08 20:52:25 -04:00
Sven Eberhardt
cf7134e60e
Fix a few warnings / possible divisions by zero
2016-10-08 20:51:51 -04:00
Sven Eberhardt
45718ee44d
Change tool hotkeys from <number> to to <Ctrl>+<number>
...
This allows better combined playing+editing experience [Maikel]
2016-10-08 19:15:28 -04:00
Sven Eberhardt
685513816f
Editor: Raise focused viewport dock.
...
When switching viewports using F10, the selected dock may have been hidden
2016-10-08 19:15:27 -04:00
Sven Eberhardt
9e150f2bfb
Viewport zoom towards center and fix scrolling
2016-10-08 19:15:26 -04:00
Lukas Werling
eff406a181
Fix plain --lobby not working
2016-10-06 21:19:31 +02:00
Armin Burgmeier
561651b715
Fix issues with resolution switching on Linux
...
* Engine would always open up in Fullscreen and then switch to Windowed
instead of just starting up as Windowed.
* Could not change resolution because bit depth or refresh rate did not match
* handle RefreshRate==0 as "any", just like windows
* Remember refresh rate in combo box that enumerates all the modes and
propagate to video mode setting instead of assuming all modes have the
same refresh rate.
* Report bit depth as 32 even if SDL tells us it's 24. Other parts of the
code require it to be equal to 32, but 24 works just fine.
* Changing from fullscreen to windowed when "Screen" was selected in
resolution combo box (i.e. iXRes==-1) makes the window tiny (0x0 pixels).
2016-10-05 21:38:46 -07:00
Armin Burgmeier
25b1a49543
Set last error when setting resolution fails
...
The last error is displayed in the GUI, so until now there was just a "(null)"
string there.
The whole (SDL) resolution switching code is completely broken as well, but
that's a different story...
2016-10-03 22:39:46 -07:00
Lukas Werling
bca0c76331
Lower minimum masterserver update interval to 1s
...
This interval is critical for the netpuncher. Clients have to wait for
the first masterserver update before they can join.
2016-10-03 00:05:23 +02:00
Armin Burgmeier
836927d93c
Don't leak static proplists with cyclic references
...
If a local variable in a definition was set to a proplist inside the
Definition() callback, and that proplist contained cyclic references
then those references were leaked. Typically cyclic references for
script-created proplists are broken in
C4PropListScript::ClearScriptPropLists, however definition proplists
are changed to be static proplists in
C4PropList::FreezeAndMakeStaticRecursively.
To fix this, each script host maintains a list of proplists made static
by FreezeAndMakeStaticRecursively, and explicitly deletes all of these
proplists on Clear().
This leak also leads to an assertion failure inside
C4PropListScript::ClearScriptPropLists in debug mode, and can also be
observed by C4PropList::PropLists not being empty after game clear.
The definition in Objects.ocd/Helpers.ocd/UserAction.ocd constructs
cyclic proplists in its Definition() call. A simpler, more minimal way
to provoke the leak is the following (it provokes the leak but not the
assertion failure):
local bla;
func Definition(def)
{
bla = {};
bla.test = { Name="Test222" , Options = { Name="Test333" } };
bla.test.Options.Link = { Name="Test444", Blub=bla.test };
}
2016-09-30 17:50:41 -10:00
Armin Burgmeier
732fff3029
Fix possible use of uninitialized variables
...
For example, creating a C4WindowSDL and deleting it without calling
::Init() on it would lead to use of uninitialized variables.
2016-09-27 21:52:55 -10:00
Lukas Werling
8a09fcc1b1
Increase REPL output depth to 10 (from 1)
...
This makes working with nested arrays and proplists a lot less annoying.
2016-09-26 16:33:24 +02:00
Maikel de Vries
679eedaf50
GetPathLength: add optional depth parameter
...
This is also exposed by the PathFinder defcore entry.
2016-09-25 21:48:19 +02:00
Lukas Werling
c3cf464a83
Editor: Fix scenario open filter ( #1817 )
2016-09-18 23:22:39 +02:00
Lukas Werling
880981ad31
Fix build on systems with non-long regex index types
2016-09-18 19:40:32 +02:00
Lukas Werling
fbb8ad5d87
Add RegexSplit()
2016-09-18 11:10:19 +02:00
Lukas Werling
219f81f004
Regex: Fix off-by-one error
2016-09-18 10:49:06 +02:00
Lukas Werling
619ad27a91
Regex: Fix infinite loop with zero-length matches
2016-09-18 01:16:06 +02:00
Lukas Werling
b614209593
SDL: Use OpenGL 3.1 if 3.2 is not available (like WGL)
2016-09-17 12:32:18 +02:00
Lukas Werling
d7cd224a4f
Add functions RegexReplace, RegexSearch and RegexMatch
2016-09-16 23:46:03 +02:00
Sven Eberhardt
61b1ab08ad
Editor: More shortcuts; show helper shortcuts in tools menu
2016-09-10 01:17:40 -04:00
Lukas Werling
8d9657a800
Change default puncher address to netpuncher.openclonk.org
2016-09-09 18:31:39 +02:00
Sven Eberhardt
2490ef4584
Editor: Add more shortcut keys
2016-09-09 00:56:16 -04:00
Sven Eberhardt
e67e429fef
Editor: Improve default layout and raise proper dialogues on tool change
2016-09-09 00:56:15 -04:00
Lukas Werling
f7376169b9
Fix crash when starting a game in fullscreen mode
2016-09-08 21:26:59 +02:00
Lukas Werling
7177c261b3
Bring back and fix the netpuncher
...
As carrier-grade NATs are becoming common, many players cannot host
Clonk games at all. The simple STUN-like netpuncher from Clonk Rage
which was removed three years ago is already effective against some
DS-Lite NATs.
With some extensions, we should be able to make it work with more
restrictive NATs as well.
This reverts commit 72002cc366
.
2016-09-08 21:10:06 +02:00
Sven Eberhardt
53b365a6d2
Editor: Add shortcuts, menu items, tooltips
2016-09-08 01:56:01 -04:00
Sven Eberhardt
0e02bad837
Editor: Disable reinit scenario button if no scenario is loaded
2016-09-08 00:25:17 -04:00
Sven Eberhardt
b95d1387a4
Editor: Add "reset to saved scenario" command
2016-09-07 01:53:54 -04:00
Sven Eberhardt
856730aabd
Fix some signed/unsigned warnings
2016-09-07 01:53:54 -04:00
Sven Eberhardt
2c20204021
Add C4SECT_ReinitScenario flag for LoadScenarioSection
...
This also resets the script engine and does player init callbacks. Useful to restart the scenario in the editor.
2016-09-07 01:53:53 -04:00
Lukas Werling
3d5f2f012a
Fix openclonk-server build
2016-09-06 22:12:06 +02:00
Sven Eberhardt
a882a6e64b
Fix black editor screen due to GL object creation and removal in wrong context
2016-09-06 02:45:17 -04:00
Sven Eberhardt
5523e685fb
Fix script engine assertion on game clear
2016-09-06 01:13:53 -04:00
Sven Eberhardt
dee6086e1d
Fix access violation in proplist-to-static conversion
2016-09-06 01:09:29 -04:00
Sven Eberhardt
ba371db0e6
Editor property enum delegate: Improve grouping when an item is also a group
2016-09-05 19:19:33 -04:00
Sven Eberhardt
d70506ee2e
Improve GetDefinitionGroupPath script function
...
* Now works on _this instead of parameter
* Now works before editor window opened
2016-09-05 18:30:04 -04:00
Sven Eberhardt
41dde5e7d0
Add script function GetDefinitionGroupPath
2016-09-05 02:00:01 -04:00
Sven Eberhardt
31ead2507a
Add Unstick() script function
...
Also add a position parameter to Stuck() script function.
2016-09-05 01:59:58 -04:00
Sven Eberhardt
3669f28b75
Fix array property delegate default value to write a copy instead of a reference when it's a static prop list
2016-09-04 02:14:30 -04:00
Sven Eberhardt
5a149b3b8a
Add alpha mask option to editor property color delegate
2016-09-03 22:07:09 -04:00
Sven Eberhardt
31121d682c
Rename option default value function property to DefaultValueFunction
...
It was "Get" and later "Set", which was always a bit confusing.
2016-09-01 18:32:24 -04:00
Sven Eberhardt
0093555b49
Fix sorting between groups and names in enum editor properties
2016-08-30 19:37:42 -04:00
Sven Eberhardt
30738c760e
Fix water splashing particles
2016-08-30 18:56:46 -04:00
Sven Eberhardt
6ac3bde3de
Fix possible crash in viewport drawing
2016-08-30 18:56:27 -04:00
Sven Eberhardt
f53a4a6597
Fix enum parameter value resolution to nil when proplist value is undefined
2016-08-29 15:18:02 -04:00
Sven Eberhardt
80d5810c3e
Another Mac/Linux build fix
2016-08-28 10:23:13 -04:00
Sven Eberhardt
5a2e96e25b
Correct a format placeholder type
2016-08-28 10:17:36 -04:00
Sven Eberhardt
0acf8a36f9
Fix Linux/Mac build
2016-08-28 10:16:06 -04:00
Sven Eberhardt
b763982f45
Fix scenario saving as network client to not delete saved scenario after game end ( #1814 )
2016-08-28 00:56:15 -04:00
Sven Eberhardt
3163332def
EditorActions: Replace %player% by first local player number
2016-08-27 22:19:25 -04:00
Sven Eberhardt
949ab90fc8
Editor: Fix enum delegate setting a value on cancel undeer certain conditions
2016-08-27 21:33:25 -04:00
Sven Eberhardt
aa8289b55b
Editor: Always commit string property changes if text has been edited
2016-08-27 21:24:43 -04:00
Sven Eberhardt
528504d72e
Editor: Hide grade circle in viewport when using rectangle or picker tool
2016-08-27 20:10:58 -04:00
Sven Eberhardt
4f74d88d51
Editor: Fix selected object property dropdown list
2016-08-27 19:56:46 -04:00
Sven Eberhardt
c98f99b427
Editor: Do not reset landscape brush when switching tools
2016-08-27 19:43:34 -04:00
Sven Eberhardt
6070bb4782
Fix editor prop enum option Set function
2016-08-27 19:05:12 -04:00
Sven Eberhardt
64f7a97eb6
Fix hang on startup on negative definition priority
2016-08-27 18:37:56 -04:00
Sven Eberhardt
6b9df3118c
Sort UserAction evaluators and groups by name
...
Also merge effect group into ambience group.
2016-08-27 16:46:59 -04:00
Sven Eberhardt
00bc92e13f
Use short names as main editor delegate display in property window.
...
Simplifies most user action displays by omitting things like "Constant" in the list.
2016-08-27 10:12:17 -04:00
Sven Eberhardt
357eb462bd
Fix display of nil enum child delegate value if stored in a proplist and key is not defined.
...
It would fall back to the outer value instead.
2016-08-27 02:21:35 -04:00
Sven Eberhardt
e4b4246500
Fix freezing and assignment of static names to child proplists created in Definition()-callbacks ( #1798 )
...
Also adjust editor props for the change:
1. enum needs to create a copy, not a reference for the default value of an option if it is defined inline
2. Always use proper GetName() resolution on property group names even if a static name would be available
2016-08-27 02:04:03 -04:00
Lukas Werling
2044fc3c06
SDL: Fix wrong keyboad button labels
2016-08-20 23:16:31 +02:00
Sven Eberhardt
568088aedb
Editor: Add Copy+Paste functionality for properties
2016-08-19 16:13:28 -04:00
Lukas Werling
26a552473c
Add support for two extra mouse buttons (#mantis-is-down-right-now)
...
This also fixes a missing definition for "MiddleDouble". Only
implemented for SDL and Qt, someone else will have to do Windows.
2016-08-18 22:43:42 +02:00
Sven Eberhardt
5d6ecc8dc8
Fix possible hang on effect execution with timer=1
...
If a timer=1-effect registered another timer=1-effect into the same object, it could cause an endless loop. This happened if the timer in the sequence object was set to 1.
2016-08-18 00:14:19 -04:00
Sven Eberhardt
20f9dbed43
Fix sync loss on InitializePlayers callback
...
It was called too early for remote clients.
2016-08-15 00:51:59 -04:00
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
Sven Eberhardt
b6fb7e884f
Qt Editor: Put current selection name before EditorHelp/Description
2016-07-27 22:36:14 -04:00
Sven Eberhardt
73510d7fb1
Qt Editor: Add sound property delegate
2016-07-27 22:35:11 -04:00
Sven Eberhardt
11b317808f
Qt Editor: Add toggle help button to "?" menu
2016-07-25 21:39:35 -04:00
Nicolas Hake
0cbb476daf
Remove re namespace alias
...
This alias is a legacy from when we were using Boost.Regexp to
workaround a broken implementation in GCC's libstdc++ earlier than 4.9.
2016-07-25 18:39:44 +02:00
Nicolas Hake
5bdddff139
Remove MS CRT memory management debugging
...
Redefining new breaks perfectly valid code, but only on MSVC and only in
one particular configuration (Debug). This is very annoying because it
means people not using MSVC, or even people doing Release builds, can
write standards-conforming code which then may fail to build for other
people.
2016-07-25 18:39:44 +02:00
Sven Eberhardt
4246a72485
Qt Editor: Add EditorHelp for enum options
2016-07-25 01:05:15 -04:00
Sven Eberhardt
ee88a36f73
Qt Editor: Rename EditorInfo to EditorHelp
...
Fits better with "UsageHelp" and is more precise.
2016-07-24 23:10:43 -04:00
Sven Eberhardt
3a6a7626c1
Qt Editor: Add help hover button to editor props
2016-07-24 23:00:24 -04:00
Sven Eberhardt
534e4cc745
Merge branch 'master' into qteditor
...
Conflicts:
src/script/C4AulParse.cpp
2016-07-24 10:23:57 -04:00
Sven Eberhardt
4245f60e83
Qt Editor: Add help/description label for current selection
2016-07-24 10:12:38 -04:00
Kanibal
a7d6a7dbd7
Use file selector instead of directory selector (select Scenario.txt for unpacked workspace) to select files
2016-07-23 22:47:15 -04:00
Kanibal
1e257c4e9e
Allow C4Window to be constructed from Qt Widget on macOS
2016-07-23 22:47:14 -04:00
Kanibal
1c63c8cbe0
Fix off-by-one mistake in C4Landscape assertion
2016-07-23 22:47:13 -04:00
Martin Plicht
78f336c67c
C4ConsoleQtViewport: Un-TODO some line for now
2016-07-23 18:20:36 +02:00
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
Sven Eberhardt
5bfd2b87c5
Qt Editor: Reorder array editing buttons below property action buttons
2016-07-23 02:34:08 -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
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
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
d605bab0be
Qt Editor: Move EditorActions from EditorAction_* to a proplist EditorAction.*
2016-07-14 00:17:53 -04:00
Sven Eberhardt
5a9e608f55
Qt Editor: Do not show properties of dead effects
2016-07-13 22:14:28 -04:00