scrawl
49c2da27b3
OpenCS compiles and runs again (no rendering)
2015-03-19 17:21:15 +01:00
Marc Zinnschlag
d053c62032
setting up global search operation and subview
2015-03-17 12:30:47 +01:00
scrawl
19e8280f45
OpenCS window title unicode fixes
2015-03-16 15:45:41 +01:00
Marc Zinnschlag
fc6c9d7ff2
Merge remote-tracking branch 'scrawl/opencs-hint-fix'
2015-03-16 08:41:36 +01:00
scrawl
6ff2523d8a
Fix for line focus when clicking on a verifier script error
...
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
2015-03-16 03:07:37 +01:00
scrawl
295ca86ac1
OpenCS FileDialog crash fix
...
The file dialog would crash when no game file is selected and an addon file with no dependency is checked, then unchecked.
2015-03-16 02:43:02 +01:00
cc9cii
5eefcd862f
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
2015-03-16 10:30:54 +11:00
cc9cii
15b9a628ac
Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.
2015-03-14 19:41:55 +11:00
cc9cii
17e6244bd6
Yet more warnings suppressed.
2015-03-14 12:42:46 +11:00
Marc Zinnschlag
26955dc6d3
Merge remote-tracking branch 'cc9cii/editor-var-edit'
2015-03-12 10:44:55 +01:00
cc9cii
418025e0a2
Add missing editor type to the dialogue. Should resolve Bug #2437 .
2015-03-12 13:10:25 +11:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
cc9cii
727b68dd15
Reduce difference with the master branch where possible.
2015-03-06 19:20:50 +11:00
cc9cii
6d6ff8c6a4
Resolved compile issues, but not fully working.
2015-03-06 14:36:13 +11:00
cc9cii
fb2ba7610c
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
2015-03-04 11:22:42 +11:00
Marc Zinnschlag
a148b851c0
added start script table
2015-03-03 14:32:12 +01:00
scrawl
f6509fe53e
Another crash fix for land record without data
2015-03-02 22:23:00 +01:00
cc9cii
1ee6153940
Remove unnecessary boolean passing between objects.
2015-03-02 06:51:31 +11:00
cc9cii
c4625b94e5
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
2015-03-01 12:52:43 +11:00
Bret Curtis
5672c86924
Rename window title for OpenMW-CS
2015-02-24 23:37:53 +01:00
cc9cii
e5c1c31648
Ignore case when detecting legacy extensions (.esm or .exp). Should resolve bug #2227 .
2015-02-16 14:27:25 +11:00
Alexander "Ace" Olofsson
62acb03735
More Ogre + recent Boost build fixes
2015-01-27 21:07:26 +01:00
Marc Zinnschlag
fa4718283d
Merge remote-tracking branch 'scrawl/contentselector'
2015-01-21 15:23:38 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
640d473866
Merge remote-tracking branch 'scrawl/master'
2015-01-15 17:33:08 +01:00
scrawl
6146a3843c
Merge remote-tracking branch 'upstream/coverity_scan' into HEAD
2015-01-15 15:59:57 +01:00
Marc Zinnschlag
c55e9b9c58
one more potential 0-pointer fix
2015-01-15 15:00:16 +01:00
Marc Zinnschlag
7615cbafce
create modify commands through command dispatcher
2015-01-15 14:24:33 +01:00
Marc Zinnschlag
706df3f881
silenced a coverity warning
2015-01-15 12:13:53 +01:00
Marc Zinnschlag
7b8e6f9dda
addressed potential 0-pointer issue
2015-01-15 12:04:23 +01:00
scrawl
b39cc0c8c8
Fix OpenCS window opening issue when config file doesn't exist
...
It would attempt to create a zero-sized window (or even negative-sized, after subtracting the frame dimensions).
2015-01-15 02:49:54 +01:00
scrawl
f11ec653d0
Add setting for showing MRK nodes to NIF loaders
...
This makes marker objects show up in OpenCS.
2015-01-13 17:29:25 +01:00
Marc Zinnschlag
9f6a2d00e8
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
2015-01-02 18:17:25 +01:00
Marc Zinnschlag
bdc28c0523
Merge remote-tracking branch 'maqifrnswa/feature1325'
2015-01-02 18:14:42 +01:00
Scott Howard
f24c1845b6
remove pop-up message on load failure
2015-01-02 10:42:09 -05:00
Scott Howard
dece4e2640
remove unneeded includes
2015-01-01 22:54:32 -05:00
Scott Howard
ce7cef924e
when loading a file fails, pop-up critical window and highlight error text
2015-01-01 22:27:08 -05:00
Thoronador
91ff536460
fix uninit, #2
2015-01-02 00:26:45 +01:00
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
2014-12-24 15:45:12 +01:00
Marc Zinnschlag
e6307a5151
move cursor in scripteditor to position of error
2014-12-08 12:29:23 +01:00
Marc Zinnschlag
6a67aba336
added double click with modifier actions in report table
2014-12-06 15:08:51 +01:00
Marc Zinnschlag
58f4cc882f
added remove action to report table context menu
2014-12-06 14:30:40 +01:00
Marc Zinnschlag
f2fc693325
added context menu to report table
2014-12-06 14:17:56 +01:00
Marc Zinnschlag
350b0cb93c
added hidden hint column to report model
2014-12-06 13:45:47 +01:00
Marc Zinnschlag
6c18a3b0b5
allow drags from report table
2014-12-06 13:19:43 +01:00
Marc Zinnschlag
7c59ea6296
added specialised report table
2014-12-06 13:01:55 +01:00
Marc Zinnschlag
f771b95a15
Merge remote-tracking branch 'cc9cii/master'
2014-12-04 20:04:19 +01:00
cc9cii
6731afc79c
Use float for setting skill use values. Should resolve bug #2183 .
2014-12-05 03:59:16 +11:00
Marc Zinnschlag
406cf2b981
disable element visibility buttons that do not apply to the respective cell type
2014-12-02 11:17:39 +01:00
cc9cii
3b5cd286f6
Do not destroy overlay if it was never created (e.g. due to an Ogre exception).
2014-12-01 14:09:22 +11:00
cc9cii
64e1594b41
Move the destruction of global resources, being used by multiple documents, to the editor.
2014-12-01 14:08:27 +11:00
cc9cii
44b11163d1
Do not delete physics objects if it was never created (e.g. preview window)
2014-12-01 10:07:02 +11:00
cc9cii
2d229c70cb
Another missed null shared_ptr conversion for gcc.
2014-12-01 09:41:03 +11:00
cc9cii
9fb4b1f499
Initialise null shared_ptr
2014-12-01 08:15:17 +11:00
cc9cii
2720e5ea9d
Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application.
2014-12-01 06:44:12 +11:00
Marc Zinnschlag
e177b66c1d
moved fog button from unpaged worldspace to worldspace
2014-11-28 09:16:39 +01:00
Marc Zinnschlag
e04ead2bd5
new element visibility button icons
2014-11-28 09:14:02 +01:00
Marc Zinnschlag
50a489321f
updated run button
2014-11-27 09:27:29 +01:00
Marc Zinnschlag
d37ff8ec63
fixed missing tooltip update for toggle/mode-type buttons
2014-11-27 08:59:21 +01:00
cc9cii
936094ae95
Set range of spinbox types in dialogsubview.
2014-11-26 08:08:28 +11:00
cc9cii
911839bb91
Simplify detecting whether a universal id represents a referenceable type.
2014-11-21 06:48:42 +11:00
cc9cii
ede1b97b46
Check the type of universal id before getting its id. Should resolve bug #2137
2014-11-19 18:10:29 +10:00
Marc Zinnschlag
5eb9fd81e1
use placeholder icons in OpenCS when no proper icon is available
2014-11-13 12:09:10 +01:00
Marc Zinnschlag
a60e4c036f
Merge branch 'mode'
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
2014-11-13 11:12:20 +01:00
Marc Zinnschlag
b7f8f848a8
added edit modes for exteriors
2014-11-13 10:45:59 +01:00
cc9cii
b86148411b
Fix for issue #2051 . Not perfect (can get into a lock in some situations) but usable.
2014-11-12 14:02:08 +11:00
Marc Zinnschlag
2acf446f18
added edit mode button to scene toolbar
2014-11-11 15:58:22 +01:00
Marc Zinnschlag
b50fcd403b
renamed getElementMask to getVisibilityMask
2014-11-09 11:29:45 +01:00
Marc Zinnschlag
9e67a07ad4
allow externally supplied ModeButtons in SceneToolMode
2014-11-07 11:11:43 +01:00
Marc Zinnschlag
4dd645559d
added ModeButton specialisation of PushButton for use in SceneToolMode
2014-11-06 13:26:19 +01:00
cc9cii
a3a0682138
Remove files no longer used, reverting to OEngine.
2014-11-06 11:16:17 +11:00
cc9cii
bf669a51c1
Merge branch 'master' into mouse-picking-physics
2014-11-06 09:46:48 +11:00
cc9cii
f051fb65ff
Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.
2014-11-06 08:35:24 +11:00
scrawl
6b88f5f33e
Use Ogre::uint8, fixes a missing include for uint8_t
2014-11-05 20:58:49 +01:00
scrawl
61d4a6b344
Merge branch 'openmw-033'
2014-11-05 20:58:42 +01:00
scrawl
ba3d2be8e3
Add missing include ( Fixes #2108 )
2014-11-05 19:45:32 +01:00
cc9cii
03abd69b4f
Include string header for gcc.
2014-11-05 07:20:20 +11:00
cc9cii
7d133d508d
Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager.
2014-11-05 07:10:14 +11:00
cc9cii
37a050873c
Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time.
2014-11-04 21:46:35 +11:00
cc9cii
70b5d6857a
Add missing files.
2014-11-04 20:52:28 +11:00
cc9cii
0e70315f91
Experimental, compiles and runs but crashes in some exit scenarios.
2014-11-04 20:43:04 +11:00
Marc Zinnschlag
bf40a3bb5d
enhanced SceneToolBar tool handling (remove and insert at specific point)
2014-11-03 13:18:53 +01:00
cc9cii
bd6e54dde3
Add function to cancel drag by pressing ESC. Remove debug code.
2014-11-03 21:24:47 +11:00
cc9cii
092080c69c
Group the commands with begin/end macros.
2014-11-03 13:57:57 +11:00
cc9cii
bf5ba41223
Fix deleting physics object when scene nodes were still referencing it. Remove unused code from MouseState. Items that do not change are fetched only once.
2014-11-03 12:46:31 +11:00
cc9cii
e3a000917c
Minor tidy up.
2014-11-03 10:04:24 +11:00
cc9cii
358cac2f0a
Fix deleting object physics again.
2014-11-03 10:03:54 +11:00
cc9cii
d9755f82c3
Position saving - work in progress.
2014-11-03 08:11:15 +11:00
cc9cii
85ef683319
Fix deleting physics object when scene node is cleared.
2014-11-03 08:10:28 +11:00
cc9cii
3796240b19
Refactor duplicate code sections.
2014-11-02 18:13:25 +11:00
cc9cii
49d416353e
Remove a redundant list.
2014-11-02 17:56:28 +11:00
cc9cii
7f54dab6ef
Fix issue where objects were sometimes unresponsive after dragging.
2014-11-02 15:34:45 +11:00
cc9cii
e174428cc5
Minor tweaks.
2014-11-02 15:03:26 +11:00
cc9cii
1eed180a5c
Fix Gcc/MSVC differences with friend class. Invert camera derived direction.
2014-11-02 11:41:11 +11:00
cc9cii
a21958d007
Add option to move the mouse against the screen frame of reference.
2014-11-02 10:30:44 +11:00
cc9cii
89bb616cbc
Remove debugging code.
2014-11-02 08:33:32 +11:00
cc9cii
8b4651f055
Move mouse related functions and states out of WorldspaceWidget.
2014-11-02 08:22:27 +11:00
cc9cii
998982b16a
Keep physics engines until physics code is moved out of OEngine.
2014-11-01 21:04:53 +11:00
cc9cii
c6a2461fbd
Delay removing physics until the document is closed. Also other general cleanup.
2014-11-01 20:51:04 +11:00
cc9cii
1ee64c7087
Add missing files for multi-document support.
2014-11-01 19:12:22 +11:00
cc9cii
b328aa1fb9
Multiple document support.
2014-11-01 18:57:39 +11:00
cc9cii
057982b1f8
Fix Subview interface clutter by keeping a map of Scenewidgets.
2014-11-01 08:29:08 +11:00
cc9cii
e51d532795
Show drag movements of objects in multiple scene managers.
2014-11-01 07:39:58 +11:00
cc9cii
d6e67b248f
Fix deleting objects and scenewidgets.
2014-11-01 07:29:16 +11:00
cc9cii
ade7f09203
Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.
2014-11-01 00:03:09 +11:00
cc9cii
ac7acb2c22
Disable more debug code.
2014-10-31 22:21:24 +11:00
cc9cii
4f685092fb
Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking
2014-10-31 22:05:24 +11:00
cc9cii
aa7b693a13
Remove debug settings and minor cleanup.
2014-10-31 22:04:10 +11:00
cc9cii
fbadaf55ee
Multiple SceneManagers per physics engine now working.
2014-10-31 21:50:57 +11:00
cc9cii
a2ac4c7650
Allow multiple scene managers per physics engine. Compiles but does not work properly.
2014-10-31 08:18:15 +11:00
cc9cii
0515159b74
Fix typo.
2014-10-29 23:38:19 +11:00
cc9cii
1741043f20
Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little.
2014-10-29 23:02:38 +11:00
Alexander "Ace" Olofsson
c1ce570e37
Use the enum value from Qt::KeyboardModifiers
...
This fixes the windows build at least
2014-10-29 04:55:06 +01:00
cc9cii
792fbd119f
Resolve incorrect merge issues.
2014-10-29 10:43:55 +11:00
cc9cii
c990ed4335
Merge branch 'mouse-picking-state' into mouse-picking
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
2014-10-29 09:33:48 +11:00
cc9cii
6ca88dc541
Merge branch 'master' into mouse-picking
...
Conflicts:
apps/opencs/model/settings/usersettings.cpp
2014-10-29 09:28:23 +11:00
cc9cii
8e2a0ea90a
Implemented moving objects around x-y plane.
2014-10-29 08:13:13 +11:00
cc9cii
68b7532383
Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.
2014-10-29 00:50:48 +11:00
cc9cii
5afaa0083f
Minimise false detection of grab & drag operation.
2014-10-28 06:42:33 +11:00
cc9cii
a01a921644
Experimental mouse event state machine for 3d editing, starting with drag & drop objects.
2014-10-28 06:01:19 +11:00
Marc Zinnschlag
e604fcf282
Merge branch 'double'
2014-10-27 09:56:52 +01:00
Marc Zinnschlag
6f4b753750
replaced regular function call from SubView to View with signal-slot-connection
2014-10-27 09:51:55 +01:00
Marc Zinnschlag
1aef9304e9
replaced the signal/slot user settings update with a regular function call
2014-10-27 09:44:18 +01:00
Marc Zinnschlag
b0a7b457f7
made double click actions in tables configurable
2014-10-27 09:32:02 +01:00
cc9cii
815e832dbb
Merge branch 'master' into mouse-picking-state
2014-10-27 18:57:42 +11:00
Marc Zinnschlag
275bf854ed
added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)
2014-10-27 08:57:18 +01:00
cc9cii
6c8320a638
More cleanup.
2014-10-27 12:09:20 +11:00
cc9cii
c2c33eac0f
Minor cleanup.
2014-10-27 08:26:01 +11:00
cc9cii
0b63ba5727
Move debug rendering code out of PhysicsSystem.
2014-10-27 08:08:33 +11:00
cc9cii
dd2c067e17
Cleanup for better legibility.
2014-10-27 06:50:51 +11:00
cc9cii
fb0f85c8db
Report terrain position on cursor position.
2014-10-26 21:15:47 +11:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
33cd04b37d
added missing sound gen table columns
2014-09-25 11:40:45 +02: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
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
