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
Armin Burgmeier
b6e573296a
CStdGLCtxQt: share with Qt's global share context
...
This allows the OpenGL context that Qt creates for QOpenGLWidget to use the
GL objects that we created beforehand.
2016-03-25 14:17:16 -07:00
Armin Burgmeier
56545dc5f3
Fix crash when constructing C4ConsoleQtDefinitionListViewer
2016-03-25 14:16:43 -07:00
Sven Eberhardt
1613885f47
Qt Editor: Use qt resource to set icon
2016-03-23 22:56:17 -04:00
Sven Eberhardt
9690174007
Qt Editor: Fix windows includes
2016-03-23 18:20:23 -04:00
Sven Eberhardt
b1ac208249
Qt Editor: Add "File->New" menu entry
2016-03-22 23:08:05 -04:00
Lukas Werling
4290038909
Move all viewport drawing to QOpenGLWidget::paintGL
...
Unfortunately, this still doesn't fix rendering. Note that the paintGL()
isn't called periodically yet, only when resizing the window.
2016-03-22 16:50:38 +01:00
Lukas Werling
eefa8749a8
Fix viewport Zoom getting set to NaN
2016-03-22 16:49:39 +01:00
Lukas Werling
e1eb62a552
Fix warnings about overridden functions
2016-03-20 21:16:52 +01:00
Lukas Werling
75f62e52f2
Make Qt editor work with the SDL engine
...
Viewport rendering doesn't quite work yet, though.
2016-03-20 21:16:52 +01:00
Lukas Werling
08d7c9dcea
Implement GetShiftWParam() with Qt
2016-03-20 21:16:52 +01:00
Sven Eberhardt
a3cdfa3221
Qt Editor: Add shadow to landscape brush circle
...
To be more visible e.g. when drawing snow or in front of a white sky
2016-03-20 11:35:20 -04:00
Sven Eberhardt
3f7d68ff2c
Qt Editor: Sort objects in object creator by name
2016-03-19 14:40:23 -04:00
Sven Eberhardt
ed0647866e
Qt Editor: Add preview for new object placement
2016-03-19 14:40:22 -04:00
Lukas Werling
b64b4e8574
Compilation fixes for Linux
2016-03-18 21:34:21 +01:00
Sven Eberhardt
4f70fdbfc8
Qt Editor landscape drawing fixes and improvements. Add brush size preview.
2016-03-18 00:26:14 -04:00
Sven Eberhardt
645520c7af
Qt Editor: Fix viewport focus and keyboard handling.
2016-03-15 22:58:41 -04:00
Sven Eberhardt
f6ce50e9e7
Qt Editor: Use qt widgets for viewports
2016-03-10 00:07:17 -05:00
Sven Eberhardt
63bbba06bb
Qt Editor: Add missing creator files
2016-03-06 13:17:14 -05:00
Sven Eberhardt
80549ca2cc
Qt Editor: Add object creator
2016-03-06 13:06:29 -05:00
Sven Eberhardt
74b3983f7f
Fix some Qt editor crashes
...
Fix use-after-delete on proplists by item view and crash on recursive execution of message processing.
2016-03-03 00:13:39 -05:00
Sven Eberhardt
771a333e21
Qt Editor: Add effects to object list view + fixes
...
Also remove cache of C4Values and use callbacks on object and effect deletion instead.
2016-02-21 22:23:42 -05:00
Sven Eberhardt
a4d28c383b
Qt Editor: Implement object list view
2016-02-18 00:11:35 -05:00
Sven Eberhardt
e0e09133d6
Qt Editor: Add some string translations.
2016-02-18 00:10:30 -05:00
Sven Eberhardt
2af22ee824
New editor (Qt-based)
...
Work in progress. So far only for Windows.
2016-02-15 08:38:06 -05:00
Sven Eberhardt
ba3160c4c3
Fix crash when console window creation fails
2016-02-11 23:35:38 -05:00
Sven Eberhardt
c9d3cd7417
Add MeltingCastle team melee
2016-02-07 17:21:14 -05:00
Maikel de Vries
1ebdc31182
add tutorial 6
...
Still intro, outro and some NPCs missing.
2016-02-07 21:29:27 +01:00
Maikel de Vries
2a4fa85583
tutorials: fix some descriptions and control strings
2016-02-07 21:29:27 +01:00
Sven Eberhardt
8273dcdf45
Fix cargo attachment vertex in balloon
2016-02-07 14:49:05 -05:00
Sven Eberhardt
3d3e848aeb
Target balloon: Allow deployment of any items.
2016-02-07 14:27:51 -05:00
Sven Eberhardt
35fcc0ff51
Fix scenario saving of array-typed visibility. Fix ItemSpawn saving and spawn def re-setting.
2016-02-07 13:21:01 -05:00
Sven Eberhardt
ef032c60fa
ItemSpawn: Simplify script, add team-only spawns, add scenario saving and add sound on collection.
...
The script now just sets visibility per player (VIS_Select) instead of creating one dummy object per player. It also uses the object directly instead of indirecting everything through an effect (the effect couldn't be used on other objects anyway).
2016-02-07 12:21:13 -05:00
Sven Eberhardt
79897ce777
Move ItemSpawn from Aerobatics to main Objects.
2016-02-07 10:43:24 -05:00
David Dormagen
28ffc3d3b1
Library_Constructor: use normal single-use instead of holding-use
...
..because the library wasn't actually USING the holding callback at all. And it had/has its own CON_Aim hackery anyway. No need for the control-library internal CON_Aim stuff then (I could imagine this might just lead to issues at some point).
2016-02-07 10:47:33 +01:00
David Dormagen
d9760cdab6
controls: properly set noholdingcallbacks to false when using ControlUseStart ( #1327 )
...
Otherwise the situation could arise where you used a ControlUseStart object (the wallkit) but noholdingcallbacks was still set to true (because e.g. you used a hammer before). Then you would not be able to move the preview.
This is described in a comment to the referenced bug.
2016-02-07 10:47:33 +01:00
David Dormagen
59739b5cf6
script GUIs: do not catch mouse-up without prior mouse-down ( #1327 )
...
Otherwise, you could open a menu on mouse-down, which would then block the mouse-up event. The control system (not the script but the engine!) would then never know that the button was released and issue a key event with repeated=1 when you pressed the button the next time.
This could lead to issues.
2016-02-07 10:47:33 +01:00
Maikel de Vries
148b217003
jet stream: do not attempt to move stuck objects
2016-02-07 10:24:36 +01:00
Maikel de Vries
a44b759472
snap digging angle to straight lines with 5 degree margin
2016-02-07 10:24:36 +01:00
Maikel de Vries
978b236596
clean up shovel script
2016-02-07 10:24:36 +01:00
Maikel de Vries
145b902f65
correctly handle SetDir for the catapult
...
Ideally the script is fully changed to correctly use dir.
2016-02-07 10:19:11 +01:00
Maikel de Vries
0a928d4a11
tutorials: various small fixes
2016-02-07 10:19:11 +01:00