Lukas Werling
de98bbef46
Fix compile errors on Linux/SDL
2016-04-06 19:17:52 +02:00
Sven Eberhardt
879d501592
Merge remote-tracking branch 'remotes/origin/qteditor' into qteditor
...
Conflicts:
src/editor/C4ConsoleQtPropListViewer.cpp
src/editor/C4ConsoleQtPropListViewer.h
src/script/C4ValueArray.cpp
2016-04-04 19:34:02 -04:00
Sven Eberhardt
98c36e5955
Qt Editor: Implement setting of properties
2016-04-03 23:46:58 -04:00
Sven Eberhardt
e8f48fd53e
Qt Editor: Win32 build fixes
2016-04-03 23:46:20 -04:00
Nicolas Hake
9dddf289db
Merge branch 'master' into qteditor
2016-04-03 21:06:32 +02:00
Nicolas Hake
eabca223f5
Update all copyright notices for 2016
2016-04-03 20:24:42 +02:00
Nicolas Hake
493c276126
Rewrite header inclusions to #include "path/to/file.h" style
2016-04-03 20:24:42 +02:00
Nicolas Hake
5134a0a0a4
Fix mape build
2016-04-03 20:24:42 +02:00
Maikel de Vries
202f2c49df
fix snowing for cloud
2016-04-03 19:11:00 +02:00
Nicolas Hake
267bb1c3f1
Landscape: Make script-edited maps work again
2016-04-03 17:23:00 +02:00
Nicolas Hake
5c0d8a9ce6
Landscape: Make script-generated maps work again
...
...by actually storing the result of the generator somewhere.
2016-04-03 17:02:41 +02:00
Nicolas Hake
ebfacb928d
GLSL: Improve line information in error messages
...
Instead of making the user count lines from the shader log, we'll now
emit #line directives and a file number->name mapping to make it easier
to figure out which file and line the error message comes from.
2016-04-03 16:17:39 +02:00
Nicolas Hake
3641509462
Mesh rotation: Keep rendered mesh inside shape
2016-04-03 13:37:04 +02:00
Nicolas Hake
de1d00eb68
Meshes: Enable reload for custom material shaders
2016-04-03 13:37:03 +02:00
Nicolas Hake
ccadd2bec3
C4Object: Remove some unimplemented func declarations
2016-04-03 13:24:28 +02:00
Nicolas Hake
0537df5f23
C4Object: Move C4Def.h dep out of header
...
C4Def is only ever used as a pointer inside C4Object.h, so we don't need
to include C4Def.h from it.
2016-04-03 13:24:26 +02:00
Nicolas Hake
735f9cc06b
C4Landscape: Pull everything private out of the header
...
Since LTCG is enabled now, we don't have to define every function inside
the headers for ~xXx super speed xXx~, which means we can strip the
headers down to their bare minimum and reduce interdependencies and
therefore recompilation times by a lot.
2016-04-03 13:24:24 +02:00
Nicolas Hake
9e9c5d0c06
CMake/MSVC: Interpolate the right variable into CMAKE_CXX_FLAGS_DEBUG
...
Instead of discarding all previous debug CXXFLAGS and replacing them
with generic ones, actually interpolate CMAKE_CXX_FLAGS_DEBUG into a
value to assign to CMAKE_CXX_FLAGS_DEBUG.
2016-04-02 02:41:50 +02:00
Nicolas Hake
893d4e295b
C4Landscape: Set dynamic mode when map was successfully generated
...
...instead of when it failed to generate.
2016-04-01 14:38:47 +02:00
Nicolas Hake
0c6fee1442
CMake: Enable LTCG/LTO
2016-03-31 23:05:00 +02:00
Nicolas Hake
d3d41721f0
CMake: Disable plain "Release" builds
...
Having a build type that's called "Release" makes people thing they
should use it when they want optimized builds. They shouldn't. They
should be using RelWithDebInfo instead, so at least trying to debug
errors isn't entirely futile.
2016-03-31 23:01:37 +02:00
Nicolas Hake
3922e7c5ee
CMake: Stop the OC_*_FLAGS song and dance
...
CMake handles adding un-cached flags properly, so we don't have to force
flags into the cache.
2016-03-31 23:01:36 +02:00
Nicolas Hake
0abef8dac5
Remove "High-res landscape" option
...
We're requiring shaders for everything else we render, so there's no
point in having a shader-free landscape renderer around.
2016-03-31 19:22:17 +02:00
Nicolas Hake
33b8d404a5
GL: Add "frameCounter" uniform
...
Add the current frame counter as a uniform variable to the shaders, so
people can use it to do time-based animation.
2016-03-31 01:44:44 +02:00
Nicolas Hake
cd0032ccf0
Do mesh rotation outside of DrawTransform
...
Mesh rotation needs to happen as part of the MeshTransform so lighting
is applied correctly. DrawTransform applies after lighting which made
rotated meshes look weird.
2016-03-31 01:19:58 +02:00
Clonkonaut
fe4132309a
Added a few more interaction menu buttons to the cable cars, animation to the station.
2016-03-30 00:55:49 +02:00
Mark
7e74baac55
Refactoring: Construction site takes materials, not the constructor
...
The functionality of taking construction materials from a clonk and lorries was extracted to a separate function and moved from the constructor to the construction site. This is a little bit of an esthetic decision, but it is also useful for my project that has a spacebar-interaction which takes construction materials from the clonk without the need to open the inventory menu.
2016-03-29 18:56:10 +02:00
Clonkonaut
fb761fbd58
Removed parentheses after 'this'.
2016-03-29 18:17:05 +02:00
Sven Eberhardt
370b9cf898
Qt Editor: Disable vsync to avoid laggy viewports
2016-03-28 23:10:10 -04:00
Mark
7110882813
Vendor: Extracted functions for ejection of contents
...
In certain overloads of the object I want to be able to not eject contents, or eject only certain objects. The default behaviour of ejecting ALL contents whenever someone buys something is annoying in certain structures, such as a marketplace.
2016-03-28 22:33:58 +02:00
Mark
44b643d1e3
Fix error when opening resource goal description
2016-03-28 22:33:48 +02:00
Lukas Werling
6eecf34e18
Build with SDL/Qt instead of GTK per default
...
This is necessary to make the autobuild server build the relevant Qt
editor code on Linux while we're on the qteditor branch.
2016-03-28 22:14:00 +02:00
Lukas Werling
a12e485458
Qt Editor: Add scroll bars to the viewports
2016-03-28 22:07:43 +02:00
Clonkonaut
e6093ee2fc
Fixed possible access of a removed zap ( #1665 ).
2016-03-28 19:21:29 +02:00
Maikel de Vries
6bdbc5b5c7
add InsertVertex script function to insert a vertex at arbitrary position
2016-03-28 17:36:00 +02:00
Maikel de Vries
12ae155015
GetVertex: return nil for invalid vertex index and improve documentation
2016-03-28 17:36:00 +02:00
Sven Eberhardt
9294d8b9dc
Qt Editor: Fix title and icon
...
Using the .ico needs a plugin that is not always loaded.
2016-03-26 23:55:28 -04:00
Lukas Werling
a79d5d1802
Fix openclonk-server build on Windows
2016-03-26 23:26:52 +01:00
Lukas Werling
f2b6897065
Qt Editor: Fix broken icons
2016-03-26 23:22:51 +01:00
Lukas Werling
baf54a88b9
Fix assertion when comparing strings of different lengths
2016-03-26 21:59:46 +01:00
Lukas Werling
ca88a0a52a
Implement new Linux editor todos
2016-03-26 21:43:37 +01:00
Lukas Werling
ea36b4f4a0
CMake: Add a QT_EDITOR_SOURCES list
2016-03-26 21:42:24 +01:00
Lukas Werling
6d9aef33c2
Merge branch 'qteditor-sdl' into qteditor
2016-03-26 20:57:10 +01:00
Lukas Werling
f8dc58e0ed
Remove Windows editor rendering hacks (untested)
2016-03-26 20:54:26 +01:00
Lukas Werling
61e97ee87e
Fix zooming not working in the editor
2016-03-26 20:40:09 +01:00
Lukas Werling
f9190cd1ea
Fix keyboard input for Qt editor/SDL
...
The SDL port used to define a separate set of key codes differing from
the usual ones. The SDL codes are now translated to make the Qt input
easy.
This also fixes a broken keycode for the '0' key.
2016-03-26 20:29:07 +01:00
Lukas Werling
30dd360a57
Update the Qt rendering widget periodically
2016-03-26 19:03:16 +01:00
Sven Eberhardt
dc7259bb1e
Qt Editor: Allow opening of user path from welcome page
2016-03-26 14:02:40 -04:00
Sven Eberhardt
b3712ace97
qt editor: Add "Editor" button to startup main menu
2016-03-26 02:15:15 -04:00
Sven Eberhardt
f2daa51fa7
Qt Editor: Add "Welcome" dock widget
2016-03-26 01:36:40 -04:00