cc9cii
|
95683bc8c3
|
Add user interface for top level window status-bar setting (implementation already existed). For feature #854.
|
2014-10-26 15:04:52 +10:00 |
|
cc9cii
|
8b0dc88db8
|
Use the correct name for deleting objects.
|
2014-10-26 08:15:18 +11:00 |
|
cc9cii
|
b46df4034d
|
Cleanup bullet objects in the destructors.
|
2014-10-26 07:56:51 +11:00 |
|
Marc Zinnschlag
|
aad13e6bff
|
close view when closing last sub-view unless this view is the last view
|
2014-10-25 18:13:56 +02:00 |
|
Marc Zinnschlag
|
a9f5632afd
|
extended double click functionality in tables
|
2014-10-25 16:27:36 +02:00 |
|
cc9cii
|
9337d6533a
|
Add terrain collision. Support visibility mask for objects and terrain.
|
2014-10-25 22:09:19 +11:00 |
|
cc9cii
|
cc0acec64c
|
Add settings to enable/disable debug rendering of mouse picking.
|
2014-10-25 21:02:40 +11:00 |
|
cc9cii
|
dd9208afeb
|
Merge remote-tracking branch 'upstream/master' into mouse-picking
|
2014-10-25 10:59:17 +01:00 |
|
cc9cii
|
54a6897df8
|
Use QString rather than std::to_string
|
2014-10-24 20:43:29 +10:00 |
|
cc9cii
|
e5dd8d06a0
|
Store object reference id to RigidBody instead of scene node handles.
|
2014-10-24 21:18:29 +11:00 |
|
cc9cii
|
cb53e714f7
|
Convert PhysicsSystem to a singleton.
|
2014-10-24 19:14:02 +10:00 |
|
cc9cii
|
98ff3e7307
|
No physics or mouse picking for object preview.
|
2014-10-24 07:57:29 +11:00 |
|
Marc Zinnschlag
|
6ff41c6a00
|
intercept shift/ctrl double-clicks in tables
|
2014-10-23 11:28:58 +02:00 |
|
cc9cii
|
2f26fc1188
|
Avoid Ogre exceptions and null pointers.
|
2014-10-23 20:14:01 +11:00 |
|
cc9cii
|
39cd89a9af
|
Make gcc happy.
|
2014-10-23 18:51:31 +11:00 |
|
cc9cii
|
4d86371ca3
|
Minor refactoring and cleanup.
|
2014-10-23 15:35:01 +11:00 |
|
cc9cii
|
cca6d0a024
|
Fixed issue with mouse picking accuracy.
|
2014-10-23 12:43:06 +11:00 |
|
cc9cii
|
fdee3fd919
|
Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance.
|
2014-10-23 06:59:14 +11:00 |
|
cc9cii
|
4b53b8658b
|
Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate.
|
2014-10-22 07:11:04 +11:00 |
|
Marc Zinnschlag
|
843493e90a
|
fixed case-problem in OpenCS script compiler
|
2014-10-21 12:38:18 +02:00 |
|
Marc Zinnschlag
|
94ae222f0e
|
Merge branch 'settings'
|
2014-10-19 13:44:15 +02:00 |
|
Marc Zinnschlag
|
a5bbfff9e2
|
another layout correction
|
2014-10-19 13:43:40 +02:00 |
|
Marc Zinnschlag
|
5a1ce4943e
|
added advance 3D rendering user settings section
|
2014-10-19 13:41:56 +02:00 |
|
cc9cii
|
8bcd415cca
|
Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working.
|
2014-10-19 07:25:54 +11:00 |
|
cc9cii
|
03a30c3f1d
|
Experimental, compiles but does not work.
|
2014-10-18 06:16:48 +11:00 |
|
Marc Zinnschlag
|
2106893563
|
silenced a compiler warning regarding null pointer dereferencing
|
2014-10-17 15:47:31 +02:00 |
|
Marc Zinnschlag
|
49938182e8
|
silenced a compiler warning regarding null pointer dereferencing
|
2014-10-17 15:46:07 +02:00 |
|
Marc Zinnschlag
|
a3c894c1e2
|
Merge branch 'cellmarker'
|
2014-10-17 14:26:16 +02:00 |
|
Marc Zinnschlag
|
994159fafd
|
fixed broken iterator
|
2014-10-17 14:23:37 +02:00 |
|
Marc Zinnschlag
|
8a05c0e5c0
|
fixed overlay singleton
|
2014-10-17 14:23:27 +02:00 |
|
Marc Zinnschlag
|
ba46bcad40
|
Revert "Don't allow viewing non-existent cells from the regionmap."
This reverts commit 7cdab41501 .
|
2014-10-17 13:52:21 +02:00 |
|
Marc Zinnschlag
|
4b921c3876
|
user settings cleanup
|
2014-10-17 13:49:33 +02:00 |
|
Marc Zinnschlag
|
ed44f3ec7d
|
added tooltip support to user settings UI
|
2014-10-16 16:22:36 +02:00 |
|
scrawl
|
e413bebe99
|
Toggle addon files when activated or clicked on checkbox rather than clicked (Fixes #1980)
|
2014-10-16 15:07:51 +02:00 |
|
Marc Zinnschlag
|
f4894deff1
|
removed special value text from spin boxes (broken feature, not used anyway)
|
2014-10-16 14:47:55 +02:00 |
|
Marc Zinnschlag
|
dddd20ba1e
|
added default values for display format settings
|
2014-10-16 14:31:13 +02:00 |
|
Marc Zinnschlag
|
799cd87b52
|
name convention and spelling fixes
|
2014-10-16 14:24:17 +02:00 |
|
Marc Zinnschlag
|
e27da6a0d4
|
removed settings file mixup
|
2014-10-16 13:59:34 +02:00 |
|
Marc Zinnschlag
|
c94c1adaf3
|
split off settings page label from internal section name
|
2014-10-16 13:48:07 +02:00 |
|
cc9cii
|
7cdab41501
|
Don't allow viewing non-existent cells from the regionmap.
|
2014-10-16 07:36:47 +11:00 |
|
cc9cii
|
094f046087
|
Convert OverlaySystem to a OpenCS style singleton.
|
2014-10-16 07:29:46 +11:00 |
|
Marc Zinnschlag
|
720ba2c0d8
|
split off settings label from internal settings name
|
2014-10-15 13:39:53 +02:00 |
|
Marc Zinnschlag
|
daf7cab416
|
refactored section handling
|
2014-10-15 12:38:17 +02:00 |
|
Marc Zinnschlag
|
219fbd427f
|
unclutter user settings declarations
|
2014-10-15 12:13:22 +02:00 |
|
Marc Zinnschlag
|
868fdfba51
|
reclaiming some unused space
|
2014-10-15 11:07:40 +02:00 |
|
Marc Zinnschlag
|
e20fa209cc
|
user settings UI layout improvements
|
2014-10-15 11:02:41 +02:00 |
|
cc9cii
|
aff6f6fdb2
|
Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.
|
2014-10-15 18:48:01 +11:00 |
|
cc9cii
|
1d0ac3b4df
|
Delete Ogre::OverlaySystem before Ogre::Root
|
2014-10-15 07:02:19 +11:00 |
|
cc9cii
|
8cebfc411b
|
Minor visual improvements.
|
2014-10-14 17:34:10 +11:00 |
|
cc9cii
|
994420aa57
|
Singleton wrapper for Ogre OverlaySystem.
|
2014-10-14 13:21:43 +11:00 |
|
cc9cii
|
57b337d368
|
Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.
|
2014-10-14 11:43:56 +11:00 |
|
Marc Zinnschlag
|
e23a32c44f
|
some cleanup
|
2014-10-13 15:26:47 +02:00 |
|
Marc Zinnschlag
|
8062faa51a
|
fixed member variable access in OpenCS script compiler (Fixes #2011)
|
2014-10-13 15:25:27 +02:00 |
|
Marc Zinnschlag
|
02acf60c0b
|
added tooltips for scopes in creator bar
|
2014-10-13 14:24:27 +02:00 |
|
cc9cii
|
961867e39f
|
Hide overlay if off screen.
|
2014-10-13 20:58:07 +11:00 |
|
cc9cii
|
313aed078e
|
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
Conflicts:
apps/opencs/CMakeLists.txt
|
2014-10-13 20:45:30 +11:00 |
|
Marc Zinnschlag
|
eb45793eab
|
Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'
|
2014-10-13 11:03:03 +02:00 |
|
cc9cii
|
43838ccf01
|
Remove override (c++11)
|
2014-10-13 16:42:50 +11:00 |
|
cc9cii
|
e58e5c2bf5
|
Update overlays independently from multiple viewports.
|
2014-10-13 15:57:01 +11:00 |
|
Thoronador
|
46496a35a1
|
fix uninitialized pointer variable in CSVDoc::SubView class
|
2014-10-12 23:42:44 +02:00 |
|
cc9cii
|
47c5bc9a19
|
Set bounding box on manual objects rather than creating meshes.
|
2014-10-13 07:42:43 +11:00 |
|
scrawl
|
9323f96211
|
Move terrainstorage to opencs_units_noqt
|
2014-10-12 17:18:27 +02:00 |
|
cc9cii
|
758ce0ed98
|
Various fixes as per feedback comments.
|
2014-10-12 21:15:50 +11:00 |
|
cc9cii
|
809b8c6d5b
|
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
|
2014-10-12 05:54:21 +11:00 |
|
Thoronador
|
ab364c9440
|
fix some more uninitialized class member fields
|
2014-10-11 00:50:32 +02:00 |
|
Thoronador
|
51cd2bb5d9
|
remove unused/double variable from CSMWorld::Column class
|
2014-10-11 00:15:36 +02:00 |
|
Thoronador
|
a799353f60
|
fix uninitialized fields in CSMDoc::Operation class
|
2014-10-11 00:06:50 +02:00 |
|
Thoronador
|
deb6452e0d
|
fix uninitialized pointer fields in CS::Editor class
|
2014-10-10 23:57:10 +02:00 |
|
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 |
|
cc9cii
|
3e5027abbb
|
Incorporate terrain height to labels and camera.
|
2014-10-10 13:36:16 +11:00 |
|
cc9cii
|
bfd10a03c0
|
User configuration manager's resource directory.
|
2014-10-10 13:35:14 +11:00 |
|
cc9cii
|
406135ee96
|
Merge remote-tracking branch 'upstream/master' into terrain
|
2014-10-09 23:47:30 +01: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 |
|
cc9cii
|
b3ef7a71e2
|
Different implementation of update overlay fix.
|
2014-10-09 05:56:44 +11:00 |
|
scrawl
|
8786fb639f
|
Implement terrain rendering in OpenCS (Fixes #1597)
|
2014-10-08 17:17:31 +02:00 |
|
cc9cii
|
5d8022bdc5
|
Update overlay upon control elements button signal.
|
2014-10-08 21:22:12 +11:00 |
|
cc9cii
|
e2560de05a
|
Don't use windows path separator.
|
2014-10-08 08:08:03 +11:00 |
|
cc9cii
|
4fd7537155
|
Use default sort until a more generic sort that uses numeric order can be implemented.
|
2014-10-08 07:59:21 +11:00 |
|
cc9cii
|
e1197e75bc
|
Handle change of names or regions to dynamically update the overlay.
|
2014-10-08 07:54:22 +11:00 |
|
cc9cii
|
7836ee9ab6
|
Fixed crash exiting internal cells. Better starting camera position for external cells.
|
2014-10-07 21:18:32 +11:00 |
|
cc9cii
|
a161ad3cd5
|
Sort cell id column by numerical order.
|
2014-10-07 20:11:44 +11:00 |
|
cc9cii
|
0cccdfd114
|
Added description below the cell id (name if exists, or region)
|
2014-10-07 19:35:28 +11:00 |
|
cc9cii
|
7640875f9d
|
More cleanup.
|
2014-10-07 10:34:30 +11:00 |
|
cc9cii
|
f48f841d31
|
Add full path for Ogre Overlay headers (workaround for osx).
|
2014-10-07 06:40:28 +11:00 |
|
cc9cii
|
0197f7088f
|
Remove extra frame rendering after enabling/disabling the label.
|
2014-10-07 06:04:13 +11:00 |
|
cc9cii
|
b3e09cce00
|
Remove mouse picking code.
|
2014-10-06 22:29:45 +11:00 |
|
cc9cii
|
972c789060
|
Add Ogre Overlay path to cmake.
|
2014-10-06 20:25:09 +11:00 |
|
cc9cii
|
cc6153eb8e
|
Removed temporary key bindings.
|
2014-10-06 14:21:44 +11:00 |
|
cc9cii
|
6d687993b8
|
Remove C++11 stuff.
|
2014-10-06 14:08:35 +11:00 |
|
cc9cii
|
e38417e662
|
Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide.
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag. No idea what is causing this.
|
2014-10-06 13:55:36 +11:00 |
|
cc9cii
|
dbb2781817
|
Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.
|
2014-10-06 08:20:09 +11:00 |
|
Marc Zinnschlag
|
2d3ffc4483
|
fixed pathgrid saving
|
2014-10-05 15:12:12 +02:00 |
|
cc9cii
|
85d93807c5
|
Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.
|
2014-10-05 19:25:37 +11:00 |
|
Marc Zinnschlag
|
be3b229a5f
|
fixed pathgrid loading
|
2014-10-04 15:36:52 +02:00 |
|
cc9cii
|
c9e054cdd7
|
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9 .
|
2014-10-04 06:20:10 +10:00 |
|
cc9cii
|
3aea1bf5f9
|
CMake changes for using Ogre Overlay.
|
2014-10-04 05:48:56 +10: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 |
|
cc9cii
|
5ffb740120
|
Fix silly mistake (thanks scrawl for picking that up)
|
2014-10-01 07:19:15 +10:00 |
|
Marc Zinnschlag
|
850a40d4e2
|
fixed resources table drag source problem
|
2014-09-30 13:15:15 +02:00 |
|
cc9cii
|
a9745cce1e
|
Suppress some compiler warnings.
|
2014-09-30 21:02:31 +10:00 |
|
Marc Zinnschlag
|
ff530a2e19
|
added missing magic effect table columns
|
2014-09-30 12:33:48 +02:00 |
|
cc9cii
|
dee090355f
|
Changes to compile on Ubuntu 14.04.
|
2014-09-30 19:23:19 +10:00 |
|
cc9cii
|
687b62dfd3
|
Revert some changes (mostly iostream adds)
|
2014-09-30 18:46:26 +10:00 |
|
cc9cii
|
312b7cd571
|
Merge branch 'master' into QtOGre
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
components/nif/niffile.hpp
libs/openengine/bullet/physic.hpp
|
2014-09-30 10:52:04 +10: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 |
|
cc9cii
|
62406d5322
|
Use reasonable values for the spinbox.
|
2014-09-23 07:28:55 +10:00 |
|
cc9cii
|
437fb774c5
|
Re-implemented subview minimum size setting.
|
2014-09-23 07:16:07 +10:00 |
|
cc9cii
|
c8ae8f4a6d
|
Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.
|
2014-09-23 06:30:41 +10:00 |
|
cc9cii
|
c4f11785ec
|
Added a window size change easter egg.
|
2014-09-22 21:12:26 +10:00 |
|
cc9cii
|
48f96df29d
|
Fixed checkboxes saving invalid values.
|
2014-09-22 18:50:48 +10:00 |
|
Marc Zinnschlag
|
5c8ef842b6
|
Merge branch 'edit'
|
2014-09-22 09:54:44 +02:00 |
|
Marc Zinnschlag
|
51151bc43e
|
minor fix
|
2014-09-22 09:53:07 +02:00 |
|
cc9cii
|
fc8d6da6a2
|
Added more shader settings.
|
2014-09-22 16:24:06 +10:00 |
|
cc9cii
|
71a3880884
|
Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout.
|
2014-09-22 12:19:18 +10:00 |
|
cc9cii
|
02f8f54192
|
Fixed checkbox behaviour. Added some shader settings.
|
2014-09-22 07:50:35 +10:00 |
|
cc9cii
|
17a74da650
|
Cleaned up comments and dead code.
|
2014-09-21 21:10:18 +10:00 |
|
cc9cii
|
dbd1ab05d3
|
Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.
|
2014-09-21 20:55:52 +10:00 |
|
Marc Zinnschlag
|
cf5c5cbce7
|
Merge remote-tracking branch 'corristo/osx-openmw-launch-fix'
|
2014-09-20 14:13:42 +02:00 |
|
Marc Zinnschlag
|
9d316a8745
|
Merge branch 'records'
|
2014-09-20 13:59:45 +02:00 |
|
Marc Zinnschlag
|
8499ceb35d
|
set default value for topic when cloning info records
|
2014-09-20 13:30:36 +02:00 |
|
Marc Zinnschlag
|
8ce87803c4
|
set default value for cell when cloning references
|
2014-09-20 12:54:25 +02:00 |
|
Marc Zinnschlag
|
b39cdb7645
|
fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)
|
2014-09-20 12:48:51 +02:00 |
|
Marc Zinnschlag
|
90ad3f332a
|
extending refnum functionality to cloning (and also enable cloning of references to a different cell)
|
2014-09-20 12:37:25 +02:00 |
|
Nikolay Kasyanov
|
9f7a8462d8
|
Fix build & OpenCS game runner code on OS X
|
2014-09-20 13:42:11 +04:00 |
|
Marc Zinnschlag
|
7733df239e
|
made CloneCommand a subclass of CreateCommand
|
2014-09-20 10:36:43 +02:00 |
|
cc9cii
|
5dfcd2ed01
|
Removed standard window size combobox. Rearranged widgets.
|
2014-09-19 08:29:06 +10:00 |
|
cc9cii
|
52354b14fc
|
Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled.
|
2014-09-18 22:17:37 +10:00 |
|
Marc Zinnschlag
|
3add4bdf35
|
rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet)
|
2014-09-18 13:41:29 +02:00 |
|
Marc Zinnschlag
|
6fbffdb98f
|
fixed reference creator error handling
|
2014-09-18 12:39:29 +02:00 |
|
Marc Zinnschlag
|
e93ab383ea
|
set refnum and increment refnum counter when creating a new reference
|
2014-09-18 12:25:17 +02:00 |
|
Marc Zinnschlag
|
33243c8c16
|
move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction)
|
2014-09-18 11:37:23 +02:00 |
|
cc9cii
|
575780ec0d
|
Display format settings working.
|
2014-09-18 17:13:53 +10:00 |
|
cc9cii
|
d9b0c81299
|
Show status bar setting working (feature #854). Turns out signals were not needed, may need to clean up later.
|
2014-09-18 16:05:32 +10:00 |
|
Stanislav
|
313bdf4e78
|
fix
|
2014-09-18 10:25:33 +06:00 |
|
cc9cii
|
86636bd960
|
Mouse events to disabled objects implemented via a signal filter.
|
2014-09-18 12:23:41 +10:00 |
|
cc9cii
|
62d2811285
|
Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events.
|
2014-09-18 07:52:54 +10:00 |
|
U-NSFW-50TH\cc9c
|
ca80a2b856
|
Merge remote-tracking branch 'upstream/master' into opencs-settings
|
2014-09-17 21:00:22 +10:00 |
|
Marc Zinnschlag
|
41275b0af3
|
Merge remote-tracking branch 'cc9cii/Bug-No-1869'
|
2014-09-17 09:20:59 +02:00 |
|
cc9cii
|
9dc4af69c6
|
Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible.
|
2014-09-17 17:13:21 +10:00 |
|
Stanislav
|
ebb223b2d3
|
Feature #1226: fixes
|
2014-09-17 09:03:02 +06:00 |
|
cc9cii
|
cb15750e40
|
Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway.
|
2014-09-17 06:29:11 +10:00 |
|
cc9cii
|
e3da37567b
|
Cleaned up and got some signals going.
|
2014-09-17 06:11:41 +10:00 |
|
Marc Zinnschlag
|
70275350de
|
rewrote command generation in GenericCreator
|
2014-09-16 13:28:11 +02:00 |
|
Marc Zinnschlag
|
b31c4e2bcd
|
Merge remote-tracking branch 'cc9cii/Bug-No-1301'
|
2014-09-16 12:52:12 +02:00 |
|
Marc Zinnschlag
|
90b45e09f7
|
added refnum column to references tables
|
2014-09-16 12:48:10 +02:00 |
|
Marc Zinnschlag
|
f5483e76cf
|
added refnum counter column to cells table
|
2014-09-16 12:30:17 +02:00 |
|
cc9cii
|
d679e0e012
|
Made more progress. Grey out disabled settings.
|
2014-09-16 19:50:25 +10:00 |
|
cc9cii
|
ffaca7a875
|
GUI added, but not yet functional.
|
2014-09-16 07:44:07 +10:00 |
|
Stanislav
|
8574d2330c
|
Feature #1226: Request UniversalId editing from table column
|
2014-09-16 00:00:34 +06:00 |
|
cc9cii
|
ecb4154ac0
|
Fixed default settings logic and cleaned up comments.
|
2014-09-15 19:33:38 +10:00 |
|
Marc Zinnschlag
|
3d8216ee17
|
fixed broken content file list in case of newly created addons
|
2014-09-15 09:51:39 +02:00 |
|
cc9cii
|
e4b836608c
|
Partially address feature #854 by reading the status bar setting from opencs.ini. Missing GUI update that will affect new top level windows.
|
2014-09-15 06:08:56 +10:00 |
|
cc9cii
|
0ec20b23aa
|
Initial working version. Video/rendering options supported. No GUI yet.
|
2014-09-15 06:08:55 +10:00 |
|
Marc Zinnschlag
|
d1d861e1be
|
Merge branch 'run'
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
|
2014-09-14 11:59:54 +02:00 |
|
Marc Zinnschlag
|
bf6150d009
|
allow project scope scripts
|
2014-09-14 11:41:28 +02:00 |
|
Marc Zinnschlag
|
081588f484
|
add project file to content file list when running OpenMW from OpenCS
|
2014-09-13 20:48:24 +02:00 |
|
Marc Zinnschlag
|
10fa205ced
|
fixed --data switch (was missing composing option)
|
2014-09-13 20:41:57 +02:00 |
|
Marc Zinnschlag
|
1254198d90
|
add debug profiles to scene subviews view drag and drop
|
2014-09-13 18:54:29 +02:00 |
|
Marc Zinnschlag
|
3ed2edb7cb
|
rewrote run tool profile management
|
2014-09-13 18:53:35 +02:00 |
|