Marc Zinnschlag
|
21b16f8425
|
Merge branch 'tables'
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
|
2014-10-10 16:11:54 +02:00 |
|
Marc Zinnschlag
|
23e969eae7
|
fixed pathgrid saving again (previous fix was incomplete)
|
2014-10-10 15:29:21 +02:00 |
|
Marc Zinnschlag
|
c85735abed
|
Merge remote-tracking branch 'scrawl/terrain'
|
2014-10-09 12:56:42 +02:00 |
|
cc9cii
|
13f028e27b
|
Avoid out of range exceptions.
|
2014-10-09 07:01:18 +11:00 |
|
scrawl
|
8786fb639f
|
Implement terrain rendering in OpenCS (Fixes #1597)
|
2014-10-08 17:17:31 +02:00 |
|
Marc Zinnschlag
|
2d3ffc4483
|
fixed pathgrid saving
|
2014-10-05 15:12:12 +02:00 |
|
Marc Zinnschlag
|
be3b229a5f
|
fixed pathgrid loading
|
2014-10-04 15:36:52 +02:00 |
|
Marc Zinnschlag
|
9fd82212b3
|
Merge remote-tracking branch 'cc9cii/opencs-settings'
|
2014-10-03 13:11:05 +02:00 |
|
cc9cii
|
115841d31d
|
Do not save window size on exit.
|
2014-10-03 05:59:24 +10:00 |
|
Marc Zinnschlag
|
f4c9897bbd
|
Merge branch 'master' into tables
|
2014-10-02 15:49:36 +02:00 |
|
Marc Zinnschlag
|
00073694c6
|
added pathgrid subview
|
2014-10-02 15:16:19 +02:00 |
|
Marc Zinnschlag
|
d64127106b
|
load and save pathgrid records
|
2014-10-02 12:30:15 +02:00 |
|
Marc Zinnschlag
|
ce52735df6
|
Merge remote-tracking branch 'cc9cii/Bug-No-1750'
|
2014-10-02 08:43:59 +02:00 |
|
cc9cii
|
517a797a3e
|
Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux.
|
2014-10-02 07:00:15 +10:00 |
|
Marc Zinnschlag
|
850a40d4e2
|
fixed resources table drag source problem
|
2014-09-30 13:15:15 +02:00 |
|
Marc Zinnschlag
|
ff530a2e19
|
added missing magic effect table columns
|
2014-09-30 12:33:48 +02:00 |
|
cc9cii
|
7675df60ba
|
Fix far clip distance (again), workaround for broken settings minimum value.
|
2014-09-29 08:17:51 +10:00 |
|
cc9cii
|
54c77cf875
|
Silence clang warnings.
|
2014-09-29 06:39:44 +10:00 |
|
cc9cii
|
f0c739b763
|
Apply camera setting changes immediately. Remove current value check for shader setting changes.
|
2014-09-29 06:27:54 +10:00 |
|
cc9cii
|
6e8977348a
|
Check the FSAA setting of windows rather than system value.
|
2014-09-28 19:43:26 +10:00 |
|
cc9cii
|
303b0ee8c6
|
Update scenewidget when antialiasing settings change.
|
2014-09-28 15:43:33 +10:00 |
|
cc9cii
|
8a0ff17c22
|
Update SceneWidget when relevant user settings change.
|
2014-09-28 14:08:14 +10:00 |
|
cc9cii
|
9902e08773
|
Apply sh::Factory settings immediately.
|
2014-09-28 11:05:27 +10:00 |
|
cc9cii
|
a25cffc242
|
Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights.
|
2014-09-28 10:17:54 +10:00 |
|
cc9cii
|
d790b8edfa
|
Revert old fix.
|
2014-09-27 23:39:22 +10:00 |
|
cc9cii
|
a2d043f43a
|
Re-check unknown record id after loading.
|
2014-09-27 23:36:27 +10:00 |
|
Marc Zinnschlag
|
e47f9c7268
|
added first batch of magic effect columns (re-using existing columns)
|
2014-09-27 12:51:46 +02:00 |
|
Marc Zinnschlag
|
aa89370db6
|
make sure magic effects added by expansions are available
|
2014-09-27 12:38:42 +02:00 |
|
Marc Zinnschlag
|
25a1112627
|
add magic effect records for newly created games
|
2014-09-27 12:26:25 +02:00 |
|
cc9cii
|
810ba61909
|
While loading overwrite records with the same id. Should resolve bug #1750.
|
2014-09-27 17:46:48 +10:00 |
|
scrawl
|
7252cb63a6
|
Fix cppcheck issues
|
2014-09-26 17:48:14 +02:00 |
|
Marc Zinnschlag
|
23fd314294
|
added magic effects table
|
2014-09-26 13:12:17 +02:00 |
|
Marc Zinnschlag
|
c321f2c252
|
load and save magic effect records
|
2014-09-26 13:05:51 +02:00 |
|
cc9cii
|
8e71f092c5
|
Comment out setMinimum which is broken.
|
2014-09-26 12:36:55 +10:00 |
|
cc9cii
|
a1c0ec2feb
|
Repair collateral damage from a purging session gone out of control.
|
2014-09-26 11:26:33 +10:00 |
|
cc9cii
|
111a35bc38
|
More strip back.
|
2014-09-26 07:16:34 +10:00 |
|
Marc Zinnschlag
|
33cd04b37d
|
added missing sound gen table columns
|
2014-09-25 11:40:45 +02:00 |
|
cc9cii
|
d5c8ff7d73
|
More removal.
|
2014-09-25 18:15:34 +10:00 |
|
cc9cii
|
127f9bb30d
|
Fix reverting to wrong version.
|
2014-09-25 09:16:10 +10:00 |
|
cc9cii
|
61bab6b1f1
|
Sanitised version. Some settings are only accessible via manually editing the config file.
|
2014-09-25 08:15:07 +10:00 |
|
cc9cii
|
31fb160376
|
More cleanup.
|
2014-09-25 06:59:04 +10:00 |
|
cc9cii
|
66852d5392
|
Code cleanup and revert incorrect settings.
|
2014-09-24 22:41:49 +10:00 |
|
cc9cii
|
fdf375fb4d
|
Reusing subviews implemented.
|
2014-09-24 13:49:19 +10:00 |
|
cc9cii
|
3f9b73812b
|
Minor fixes and workarounds.
|
2014-09-24 11:55:22 +10:00 |
|
cc9cii
|
970f3609c9
|
Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments.
|
2014-09-24 09:33:19 +10:00 |
|
cc9cii
|
67503c93b2
|
Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.
|
2014-09-23 22:33:49 +10:00 |
|
Marc Zinnschlag
|
7ab4881661
|
added sound gen table
|
2014-09-23 13:21:54 +02:00 |
|
cc9cii
|
d41230a0c5
|
Tweak the look of the recordfilterbox. Keep titlebar if floating.
|
2014-09-23 20:51:14 +10:00 |
|
Marc Zinnschlag
|
02247fe712
|
load and save sound gen records
|
2014-09-23 12:20:02 +02:00 |
|
cc9cii
|
ffae816aab
|
Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.
|
2014-09-23 17:01:08 +10:00 |
|