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

8874 Commits (de98bbef468c19489d77be5928de31c5d8b979c8)
 

Author SHA1 Message Date
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
Clonkonaut 2db254b948 Updates cable cars / lorries with new graphics by pluto. Made everything work again. Integrated control into the interaction menu. 
Still needs a lot of work but I'm getting there.
 2016-03-26 00:14:20 +01: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
Lukas Werling 43177e8951 Fix rain failing to insert material 2016-03-23 16:02:36 +01:00
Maikel de Vries 26f030f18a remove airship solid mask in aerobatics after intro has finished 2016-03-23 15:24:38 +01:00
Lukas Werling 7d1109cef7 Merge branch 'weather' (close GH-12) 2016-03-23 13:35:07 +01:00
Lukas Werling 634ec69052 Fix invisible water splash particles 2016-03-23 13:32:44 +01:00
Lukas Werling c9c64a942e Improve rain drop performance 2016-03-23 13:32:43 +01:00
Lukas Werling a309f91af0 Cloud: Improve smoking condition (e.g. lava hits water) 2016-03-23 13:32:43 +01:00
Lukas Werling cb64c83bd5 Add Cloud::SetVisualRainStrength for adjusting particle rain strength 2016-03-23 13:32:43 +01:00
Lukas Werling c0275011b3 Add sound (by ala) for water and acid rain 2016-03-23 13:32:36 +01:00
Lukas Werling f5ce3dc12b Cloud: Performance optimizations around particles 2016-03-23 13:30:13 +01:00
Lukas Werling f88d0659da Add real snow to snowing cloud 2016-03-23 13:24:18 +01:00
Lukas Werling 7661b13ba6 Move particle proplist definitions to global Particles.c 2016-03-23 13:24:18 +01:00
Lukas Werling 292418a964 Add Randrian's rain hit effects 2016-03-23 13:24:18 +01:00
Lukas Werling 021ecb0b2e Integrate Randrian's rain particles into Cloud.ocd 2016-03-23 13:24:18 +01:00
Lukas Werling 4f72a276af Import Randrian's rain particles 2016-03-23 13:23:14 +01:00
Sven Eberhardt b1ac208249 Qt Editor: Add "File->New" menu entry 2016-03-22 23:08:05 -04:00
Maikel de Vries d6b963d321 remove unused LineMaxDistance property 2016-03-22 22:26:46 +01:00
Maikel de Vries 9d026da0a2 acid drilling: use new max length for pipes 2016-03-22 22:15:31 +01:00
Maikel de Vries bf1b65c8bd fix loam usage bar margins 2016-03-22 22:12:36 +01:00
Maikel de Vries 7693276a48 implement max length for pipe and show it in inventory HUD 2016-03-22 22:09:02 +01:00
Maikel de Vries dc1e828cfb add callback OnLineChange when line changes its vertices or vertex positions 2016-03-22 21:53:32 +01:00
Maikel de Vries fc008241cd rename LineBreak callback to OnLineBreak 2016-03-22 18:58:55 +01: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 19caa65b7b Merge branch 'sdl-gamecontroller' (pull request GH-17) 2016-03-21 16:39:28 +01:00
Lukas Werling 21fd0805d0 Merge branch 'gtk-mousegrab' (pull request #18) 2016-03-21 16:27:24 +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
Maikel de Vries 8d2ab69d03 make GetDefinition work on string parameter 
This can be useful to check if a definition is loaded, ideally the implementation is moved to the engine.
 2016-03-20 09:15:35 +01: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
Lukas Werling b50a059350 Hot Ice: Add a countdown before the round begins 2016-03-18 18:11:17 +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
Clonkonaut dc74a2301f Mooq: Fixed mesh rotation. 2016-03-14 12:07:46 +01:00
Sven Eberhardt f6ce50e9e7 Qt Editor: Use qt widgets for viewports 2016-03-10 00:07:17 -05:00
Maikel de Vries 0b1011ff8f Merge branch 'lluchs-hotice-rounds' 2016-03-09 21:49:47 +01:00
Maikel de Vries d0ee605728 Merge branch 'hotice-rounds' 2016-03-09 21:47:44 +01:00
Lukas Werling 2236d4fa4a Hot Ice: Allow scrolling while waiting for the next round 2016-03-09 21:29:42 +01:00
Lukas Werling 3b039f8342 Hot Ice: Add scoreboard 2016-03-09 21:08:14 +01:00
Maikel de Vries 21c5f63d44 wipf: dig free is covered with earth (#1703) 2016-03-09 20:54:43 +01:00
Lukas Werling d2836bb70a Hot Ice: Add option for multiple rounds 2016-03-09 00:32:02 +01:00