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

3621 Commits (af2a74b6ec00a5b04e3ffcafd6ea974b6f245ad8)

Author SHA1 Message Date
Sven Eberhardt af2a74b6ec Qt Editor: Array editing 2016-05-28 09:30:54 -04:00
Sven Eberhardt d304b17028 Qt Editor: Editing of child proplists 2016-05-24 23:06:00 -04:00
Sven Eberhardt 8a5dbdc73f Qt Editor: More shape prop storage options 2016-05-23 19:22:49 -04:00
Sven Eberhardt 747077b71b Qt Editor: Fix effect properties 2016-05-23 19:22:05 -04:00
Sven Eberhardt 881534bee0 Qt Editor: Shape properties 2016-04-25 16:17:10 -04:00
Sven Eberhardt f594737d7e Fix Definition() call order to prevent possible sync loss. 2016-04-16 23:00:31 -04:00
Sven Eberhardt 901399f5c2 MSVC compile warning fix 2016-04-16 22:05:37 -04:00
Sven Eberhardt c0228be4e7 Qt Editor: More editor property types and functionality 2016-04-16 22:05:35 -04:00
Armin Burgmeier 0580132d81 Fix the build on Linux 
With NULL, the function call was ambiguous. Use nullptr to choose the overload
taking a pointer and not the one taking an integer.
 2016-04-10 13:27:16 -07:00
Armin Burgmeier d04c4a16ae Fix comparing strings of different lengths 
Strings should not compare equal if they only share a common prefix.
 2016-04-10 13:22:56 -07:00
Armin Burgmeier 208cb12b2e Fix crash on shutdown 
a) make sure the context is deselected on destruction, so that
   CStdGL::Clear() destructor doesn't try to deselect a non-existing context.
b) Calling Clear() in CStdGLCtx::~CStdGLCtx() does only call
   CStdGLCtx::Clear(), even though Clear() is virtual. The reason is that by
   the time the CStdGLCtx destructor is executed, the CStdGLCtxQt part of the
   object has already been destructed. Therefore, make CStdGLCtx::Clear() safe
   to be run without the context ever having been initialized, and explicitly
   call CStdGLCtxQt::Clear() in CStdGLCtxQt::~CStdGLCtxQt(). This is certainly
   not the most elegant way to handle this, but it should do the job for now.
 2016-04-10 12:06:57 -07:00
Armin Burgmeier cf708a7cb1 Some cleanup in CStdGLCtxQt 2016-04-10 12:06:57 -07:00
Sven Eberhardt 2a2fc68e3f Qt Editor: Add user properties 2016-04-09 14:29:02 -04:00
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
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 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 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
Sven Eberhardt 370b9cf898 Qt Editor: Disable vsync to avoid laggy viewports 2016-03-28 23:10:10 -04:00
Lukas Werling a12e485458 Qt Editor: Add scroll bars to the viewports 2016-03-28 22:07:43 +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 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 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
Armin Burgmeier fca5106a33 FoW rendering: reset to previous framebuffer instead of default one 
The QOpenGLWidget is set up to render into a custom framebuffer, and by
resetting to render into the default framebuffer, we don't draw anything in
the buffer that is actually going to be displayed by the widget.
 2016-03-25 17:29:23 -07:00