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
Nicolas Hake
36aa83b128
Fix rendering on pre-3.2 hardware ( #1459 )
2016-06-27 13:51:56 +02:00
Nicolas Hake
ad091fcfcf
Fix shader code memory lifetime problem
...
I love StdBuf SO MUCH!
2016-06-27 12:40:35 +02:00
Nicolas Hake
9a45843828
WGL: Fall-back to a 3.1 context if 3.2 context creation fails
...
This is an emergency fallback for older Intel drivers on Windows, which
do not support OpenGL 3.2. As we're creating 3.2 contexts mostly to
access the Core profile, which was not available in earlier versions,
falling back to 3.1 should be fine; I don't think we're using anything
specific to 3.2.
2016-06-27 01:08:28 +02:00
Nicolas Hake
cc595ec58d
GL Legacy: Survive skinning meshes with no bones
2016-06-27 01:05:18 +02:00
Lukas Werling
440751691d
Fix build with CMake >= 3.1.0 and Qt 5.7
2016-06-26 16:57:26 +02:00
Sven Eberhardt
bc5eca903f
Fix mac build
2016-06-24 20:27:53 -04:00
Sven Eberhardt
62d3817d6a
Merge branch 'master' into qteditor
2016-06-24 18:23:34 -04:00
Lukas Werling
622360c359
Set default build type to RelWithDebInfo
2016-06-24 23:55:57 +02:00
Lukas Werling
b771baae28
SDL: Fix missing -lX11
2016-06-24 23:41:03 +02:00
Nicolas Hake
ef5b39a290
OS X: Pass CMAKE_SYSROOT through to osx_bundle_libs
2016-06-24 19:20:33 +02:00
Nicolas Hake
cc8725e332
OS X: Handle 10.11 SDK .tbd files
2016-06-24 19:20:33 +02:00
Nicolas Hake
692b8a9cc5
OS X: Stop whitelisting libraries to bundle
...
Just bundle everything that we have available.
2016-06-24 19:20:33 +02:00
Nicolas Hake
721753b396
OS X: Query pkg-config for freetype location
...
Nobody remembers why we're not using pkg-config on OS X, so we'll go back
to it and see what breaks.
2016-06-24 19:20:33 +02:00
Nicolas Hake
b7f1bb749b
freetype: Let system module handle REQUIRED attribute
...
If pkg-config can't find the freetype libraries, maybe the cmake system
module can. And if it can't, then it'll still fail if REQUIRED is set.
2016-06-24 19:20:33 +02:00
Julius Michaelis
35dc23826a
Add engine-resource.c to .gitignore
2016-06-23 23:37:20 +02:00
David Dormagen
6524136c9d
inventory: collect directly into pushed lorry when using Shift
...
As suggested by Dmyst: http://forum.openclonk.org/topic_show.pl?pid=32169#pid32169
2016-06-22 09:53:52 +02:00
Sven Eberhardt
5c965aba2e
Fix mape build
2016-06-22 01:47:45 -04:00
Sven Eberhardt
ed368e128b
Qt Editor: Ensure duplicated objects are moved to the cursor without extra mouse movement
2016-06-22 01:46:13 -04:00
Sven Eberhardt
8158cbf87c
Qt Editor: Allow hotkey (F2) to duplicate selected objects.
...
Also reset cursor pos to center of duplicated objects to ensure they're on screen when duplicating by hotkey.
2016-06-22 01:04:14 -04:00
Sven Eberhardt
b34ae09437
Fix utility builds
2016-06-21 21:48:10 -04:00
Clonkonaut
c766078b50
Added a new variation of coniferous tree by Nachtfalter.
2016-06-21 19:16:40 +02:00
Clonkonaut
c77ab10b55
Added an additional guidepost, a decorative object by Nachtfalter.
2016-06-21 19:15:57 +02:00
Clonkonaut
fd98ed3246
Fixed dimensions of coniferous burned 3.
2016-06-21 19:14:54 +02:00
Clonkonaut
72c4a55d78
Added texture to Sproutberry Bush, by Pyrit.
2016-06-21 19:14:23 +02:00
Sven Eberhardt
a7aa89f168
Merge branch 'master' into qteditor
...
Conflicts:
planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c
src/platform/C4WindowSDL.cpp
src/script/C4AulParse.cpp
src/script/C4Effect.cpp
2016-06-20 22:27:03 -04:00
Sven Eberhardt
9d9db0d9d5
Qt Editor: Fix grouped item selection in enum property delegate
2016-06-20 19:48:02 -04:00
Sven Eberhardt
e97491940f
Qt Editor: Fix possible crash if am object is deleted while the object selection delegate combo box is open
2016-06-20 19:13:50 -04:00
Sven Eberhardt
068004d9af
Remove unused variable in C4AulExec
2016-06-20 15:50:36 -04:00
Sven Eberhardt
b6526d2f65
Qt Editor: Always duplicate contents with objects
...
Even if they are not selected, this is probably what the user expects.
2016-06-20 15:50:35 -04:00
Lukas Werling
302fa5e362
Qt Editor: Make main loop calls more efficient
2016-06-20 16:56:20 +02:00
Lukas Werling
fc10992ab7
Fix crash when starting a game in fullscreen mode
2016-06-20 16:55:23 +02:00
Lukas Werling
b853f99b28
Fix -Wc++11-narrowing error in clang
2016-06-20 16:08:37 +02:00
Sven Eberhardt
44d94d5043
Improve editor duplicate function to duplicate properties and object connections.
...
It serializes objects using a selective SaveScenarioObjects script callback and then just executes the generated script. This automatically saves important properties, connects switches and doors, etc.
This change also solves the problem that duplicating an elevator plus case would create two elevator cases.
If execution fails (e.g. because of script errors or because a non-saveable object was duplicated), the method falls back to the legacy duplication method of creating objects with the same prototypes at the same position.
2016-06-20 01:45:26 -04:00
Sven Eberhardt
c6e4bfd585
Aul: Add DirectExec method for executing a complete function definition.
2016-06-20 01:37:04 -04:00
Sven Eberhardt
e7be7d6acd
Qt Editor: Add viewport context menu
2016-06-19 22:45:12 -04:00
David Dormagen
890c430a17
controls: allow to put items into pushed containers via [throw]
...
as requested by Dmyst here http://forum.openclonk.org/topic_show.pl?pid=32082#pid32082
2016-06-19 20:23:29 +02:00
Nicolas Hake
e490428f29
Win32: Drastically improve load times with unpacked planet/
...
C4Group::SearchNextEntry would waste lots of cycles looking up file
attributes that were never inspected afterwards. Since all we want is
the file size, and we already get that for free from FindFirstFile and
FindNextFile, store it with the directory iterator instead of querying
it at every iteration.
This reduces load times on my machine by almost half, tested across
several different scenarios.
2016-06-19 17:08:50 +02:00
Tobias Zwick
0ad8e15c8a
in the documentation, always have "docs" preselected in the search shown in the header
2016-06-19 17:00:18 +02:00
Nicolas Hake
e9c5facf91
GL: Disable hardware-based skinning on old Intel devices
...
Our hardware-based skinning doesn't work on certain Intel graphics
devices. Fall back to software skinning on GPUs that return an OpenGL
3.1 context even though we explicitly request a 3.2 one.
Might fix #1459 , #1689 .
2016-06-19 13:45:12 +02:00
Nicolas Hake
9555bf737f
GL: Bail earlier when encountering degenerate matrices
2016-06-19 11:22:04 +02:00
Sven Eberhardt
7d43d364d0
Add StoneDoor EditorActions to open/close door
...
Replacing the old EditCursorCommands.
2016-06-19 00:09:37 -04:00
Sven Eberhardt
34289fa18a
Qt Editor: Add EditorActions.
...
Replacing the old EditCursorCommands (which nobody knew). Objects now publish their commands directly on the property viewer.
2016-06-19 00:08:09 -04:00
Clonkonaut
ecc386e6e7
Fix Dark Castle goal description ( #1667 ).
2016-06-19 00:18:58 +02:00
Clonkonaut
ff92f958ac
A different brick texture by Matthi.
2016-06-19 00:10:27 +02:00
Clonkonaut
3637e1f072
Fix the clonk sometimes stuck in infinite jump animation when actually scaling with one vertex.
2016-06-18 19:47:39 +02:00