scrawl
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
scrawl
99e1720980
Add SceneManager and clone utility
2015-03-26 18:02:51 +01:00
scrawl
e3bfbcb44b
OpenCS: connect navigation button to OSG camera manipulators
2015-03-26 00:55:58 +01:00
scrawl
1edccdbe55
OpenCS: apply visibility flags to osg node
2015-03-26 00:27:39 +01:00
scrawl
72400747f2
OpenCS: preliminary port of cell rendering to OSG
2015-03-25 23:35:10 +01:00
scrawl
aedafe651a
OpenCS: delete physicssystem, will be replaced with OSG picking
2015-03-25 19:08:09 +01:00
scrawl
46cbec9a4a
Add skinning auto-detection in nifosg loader
2015-03-25 15:39:41 +01:00
scrawl
36ad40827b
Move parent node attachment out of nifloader
2015-03-23 16:17:40 +01:00
scrawl
d6dea31b88
OpenCS: Use a CompositeViewer with multiple views instead of multiple viewers
...
Fixes the rendering glitches, turns out that multiple osgViewers were never an intended use case.
2015-03-23 15:55:57 +01:00
scrawl
5a582e7eb7
Reintroduce showMarkers flag
2015-03-23 01:57:14 +01:00
scrawl
15f9c1ddcf
NiBSPArrayController works
2015-03-21 23:10:52 +01:00
scrawl
4957ceeb1d
Refactor controllers, now part of the scene graph as UpdateCallbacks
...
Practical benefits:
- The controller update is now run automatically
- Creating an instance of a scene graph should now work properly using the defined copy constructors
2015-03-20 19:51:54 +01:00
scrawl
af27a10b0c
OpenCS: preliminary port of PreviewWidget to OSG
2015-03-20 16:22:33 +01:00
scrawl
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
2015-03-20 16:22:33 +01:00
scrawl
40fc097722
OpenCS: use the new VFS, restored resource tables
2015-03-20 16:22:33 +01:00
scrawl
49c2da27b3
OpenCS compiles and runs again (no rendering)
2015-03-19 17:21:15 +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
Marc Zinnschlag
79339ebff1
Merge remote-tracking branch 'scrawl/opencs-crashfix'
2015-03-16 08:40:02 +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
scrawl
4d0bb6329a
Fix incorrect reference check
...
This check was broken for exterior cells (empty cell id).
It was superfluous anyway. A CellRef is owned by the cell it is in, so the cell must always exist.
2015-03-16 01:50:57 +01:00
Marc Zinnschlag
cf077dcf5d
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
2015-03-14 14:25:49 +01:00
Marc Zinnschlag
55bd0c728e
Merge branch 'threadfix'
2015-03-14 12:00:35 +01:00
Marc Zinnschlag
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
2015-03-14 12:00:24 +01: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
cc9cii
fd86076db3
More warning fixes.
2015-03-14 08:09:19 +11:00
cc9cii
4f6c772437
Fix more warnings.
2015-03-14 06:36:35 +11:00
cc9cii
488bc76da5
Fix saving land data.
2015-03-13 22:06:55 +11:00
cc9cii
589b0b9171
Add saving land and land textures. Should resolve Bug #2447 .
2015-03-13 08:01:48 +11:00
Marc Zinnschlag
8e37e9a14a
removed redundant functions
2015-03-12 10:51:50 +01:00
Marc Zinnschlag
8a8db8bc24
Merge remote-tracking branch 'cc9cii/editor-clone-fix'
2015-03-12 10:45:51 +01: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
cc9cii
dc9af19dcf
Don't use C++11 features.
2015-03-12 08:28:26 +11:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
cc9cii
28259f914c
Remove potential memory leak.
2015-03-11 10:49:21 +11:00
cc9cii
43ec933b7b
Revert to the original clone() method. Create a new copy method for modified records.
2015-03-10 09:45:35 +11:00
cc9cii
8ac7b77d36
For RefId's, modify a copy of the base record rather than modifying the record directly.
2015-03-10 06:51:54 +11:00
cc9cii
8b3adec3ec
Added a missing copy constructor.
2015-03-09 21:25:41 +11:00
cc9cii
f90cdec53b
Remove default parameters from the implementation.
2015-03-09 16:24:35 +11:00
cc9cii
6087a18c94
Implement clone() using a new Record constructor.
2015-03-09 14:58:07 +11:00
cc9cii
128371c902
Copy base data to modified.
2015-03-08 15:50:50 +11:00
cc9cii
a54ab153b0
Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429 .
2015-03-08 10:05:10 +11:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
Marc Zinnschlag
0b70fdac57
added start script verifier
2015-03-05 11:24:01 +01:00
Marc Zinnschlag
1ed606065c
save start script records
2015-03-03 16:11:00 +01:00
Marc Zinnschlag
a148b851c0
added start script table
2015-03-03 14:32:12 +01:00
