Marc Zinnschlag
|
55bd0c728e
|
Merge branch 'threadfix'
|
10 years ago |
Marc Zinnschlag
|
c0dfad23b3
|
Fixed editor operation multi-threading (Fixes #923)
|
10 years ago |
cc9cii
|
15b9a628ac
|
Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.
|
10 years ago |
cc9cii
|
17e6244bd6
|
Yet more warnings suppressed.
|
10 years ago |
cc9cii
|
fd86076db3
|
More warning fixes.
|
10 years ago |
cc9cii
|
4f6c772437
|
Fix more warnings.
|
10 years ago |
cc9cii
|
488bc76da5
|
Fix saving land data.
|
10 years ago |
cc9cii
|
589b0b9171
|
Add saving land and land textures. Should resolve Bug #2447.
|
10 years ago |
Marc Zinnschlag
|
8e37e9a14a
|
removed redundant functions
|
10 years ago |
Marc Zinnschlag
|
8a8db8bc24
|
Merge remote-tracking branch 'cc9cii/editor-clone-fix'
|
10 years ago |
Marc Zinnschlag
|
26955dc6d3
|
Merge remote-tracking branch 'cc9cii/editor-var-edit'
|
10 years ago |
cc9cii
|
418025e0a2
|
Add missing editor type to the dialogue. Should resolve Bug #2437.
|
10 years ago |
cc9cii
|
dc9af19dcf
|
Don't use C++11 features.
|
10 years ago |
Scott Howard
|
e2ef8c4022
|
fix -Wnewline-eof warnings
|
10 years ago |
cc9cii
|
28259f914c
|
Remove potential memory leak.
|
10 years ago |
cc9cii
|
43ec933b7b
|
Revert to the original clone() method. Create a new copy method for modified records.
|
10 years ago |
cc9cii
|
8ac7b77d36
|
For RefId's, modify a copy of the base record rather than modifying the record directly.
|
10 years ago |
cc9cii
|
8b3adec3ec
|
Added a missing copy constructor.
|
10 years ago |
cc9cii
|
f90cdec53b
|
Remove default parameters from the implementation.
|
10 years ago |
cc9cii
|
6087a18c94
|
Implement clone() using a new Record constructor.
|
10 years ago |
cc9cii
|
128371c902
|
Copy base data to modified.
|
10 years ago |
cc9cii
|
a54ab153b0
|
Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429.
|
10 years ago |
cc9cii
|
ca21181483
|
Fix typo to get table display working.
|
10 years ago |
Marc Zinnschlag
|
907ac5ef7f
|
Merge remote-tracking branch 'scrawl/master'
|
10 years ago |
cc9cii
|
727b68dd15
|
Reduce difference with the master branch where possible.
|
10 years ago |
cc9cii
|
6d6ff8c6a4
|
Resolved compile issues, but not fully working.
|
10 years ago |
scrawl
|
0fda1cdd53
|
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
|
10 years ago |
Marc Zinnschlag
|
0b70fdac57
|
added start script verifier
|
10 years ago |
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
|
10 years ago |
Marc Zinnschlag
|
1ed606065c
|
save start script records
|
10 years ago |
Marc Zinnschlag
|
a148b851c0
|
added start script table
|
10 years ago |
Marc Zinnschlag
|
4e1c086d6a
|
load start up script records
|
10 years ago |
Marc Zinnschlag
|
455684981c
|
Merge remote-tracking branch 'scrawl/master'
|
10 years ago |
cc9cii
|
66ef9d237c
|
Another try to make it work with gcc/travis.
|
10 years ago |
cc9cii
|
7c0f5b72c5
|
Add enum namespace to workaround travis.
|
10 years ago |
scrawl
|
f6509fe53e
|
Another crash fix for land record without data
|
10 years ago |
cc9cii
|
a8427c2efb
|
Do not add NAME subrecords while saving magic effects or scripts.
|
10 years ago |
Marc Zinnschlag
|
928bb234ce
|
Merge remote-tracking branch 'cc9cii/editor-gamefiles'
|
10 years ago |
cc9cii
|
1ee6153940
|
Remove unnecessary boolean passing between objects.
|
10 years ago |
Marc Zinnschlag
|
64938b3796
|
Merge remote-tracking branch 'cc9cii/saving-skil'
|
10 years ago |
Marc Zinnschlag
|
59c7fe28d9
|
Merge remote-tracking branch 'naclander/master'
|
10 years ago |
cc9cii
|
5ff66ad40b
|
Fix Bug #2402. SKIL records should not have NAME subrecord.
|
10 years ago |
cc9cii
|
c4625b94e5
|
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
|
10 years ago |
scrawl
|
3158d34abb
|
Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all.
|
10 years ago |
Bret Curtis
|
5672c86924
|
Rename window title for OpenMW-CS
|
10 years ago |
Nathan Aclander
|
6d7e1242cc
|
Fixed incorrect casting
Only cast to strings things that are ints. Also I missed an mFactionRank to cast.
|
10 years ago |
Nathan Aclander
|
539e8276c8
|
Silenced clang warning by converting int to string
|
10 years ago |
cc9cii
|
e5c1c31648
|
Ignore case when detecting legacy extensions (.esm or .exp). Should resolve bug #2227.
|
10 years ago |
Marc Zinnschlag
|
6cc9fa2b3f
|
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
|
10 years ago |
Alexander "Ace" Olofsson
|
a61019dfa8
|
Update referencecheck.cpp
MSVC does not allow for the usage of 'and' or 'or' literals
|
10 years ago |
Kamil Bar
|
3b7a23aa72
|
Fixed charge checks for light and other objects, corrected CellRef charge union comments
|
10 years ago |
Kamil Bar
|
9628415e21
|
Missing change & changed comments to represent actual code
|
10 years ago |
Kamil Bar
|
52a064afc3
|
Fixed charges checking
|
10 years ago |
Kamil Bar
|
e1314d6211
|
Implement OpenCS reference validation (Feature #831)
|
10 years ago |
slothlife
|
cfe81bafe8
|
Remove setting CMAKE_BUILD_TYPE to Debug
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
|
10 years ago |
Alexander "Ace" Olofsson
|
b714e5211d
|
Redefinition of default template argument
Sometimes it's annoying how MSVC casually allows you to break C++ standards
|
10 years ago |
Alexander "Ace" Olofsson
|
f77ae711e4
|
Fix template closer
|
10 years ago |
Alexander "Ace" Olofsson
|
cfcaf4528f
|
Some more forward-declaring for OpenMW-CS
|
10 years ago |
Nikolay Kasyanov
|
5534306eb3
|
Few rename fixes
|
10 years ago |
scrawl
|
0b7b627443
|
CMake fix for opencs rename
|
10 years ago |
Marc Zinnschlag
|
0557d45bd1
|
renamed opencs into openmw-cs
|
10 years ago |
Alexander "Ace" Olofsson
|
62acb03735
|
More Ogre + recent Boost build fixes
|
10 years ago |
Marc Zinnschlag
|
7f905470fa
|
fixed moved reference loading
|
10 years ago |
Marc Zinnschlag
|
89998a6a03
|
save MVRF subrecords
|
10 years ago |
scrawl
|
c7d15e6f74
|
Revert "Revert "Light charge handling fix""
This reverts commit b95748d044 .
|
10 years ago |
scrawl
|
b95748d044
|
Revert "Light charge handling fix"
This reverts commit 5e0428243b .
|
10 years ago |
Marc Zinnschlag
|
a97f599e65
|
fixed ref num saving in non-wide format
|
10 years ago |
Marc Zinnschlag
|
fa4718283d
|
Merge remote-tracking branch 'scrawl/contentselector'
|
10 years ago |
Marc Zinnschlag
|
cd62dbc5b7
|
Merge remote-tracking branch 'scrawl/essimporter'
|
10 years ago |
scrawl
|
5e0428243b
|
Light charge handling fix
|
10 years ago |
Marc Zinnschlag
|
9670e0881d
|
update reference's current cell when x/y-coordinates are modified
|
10 years ago |
Marc Zinnschlag
|
561ddfa0c5
|
make column type accessable via the regular table model
|
10 years ago |
Marc Zinnschlag
|
9603325b99
|
Merge remote-tracking branch 'origin/master'
|
10 years ago |
Marc Zinnschlag
|
640d473866
|
Merge remote-tracking branch 'scrawl/master'
|
10 years ago |
scrawl
|
6146a3843c
|
Merge remote-tracking branch 'upstream/coverity_scan' into HEAD
|
10 years ago |
Marc Zinnschlag
|
c55e9b9c58
|
one more potential 0-pointer fix
|
10 years ago |
Marc Zinnschlag
|
7615cbafce
|
create modify commands through command dispatcher
|
10 years ago |
Marc Zinnschlag
|
706df3f881
|
silenced a coverity warning
|
10 years ago |
Marc Zinnschlag
|
7b8e6f9dda
|
addressed potential 0-pointer issue
|
10 years ago |
Marc Zinnschlag
|
f3c7532660
|
cleaned up some enum confusion
|
10 years ago |
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).
|
10 years ago |
scrawl
|
f11ec653d0
|
Add setting for showing MRK nodes to NIF loaders
This makes marker objects show up in OpenCS.
|
10 years ago |
Marc Zinnschlag
|
320b994aef
|
keep original cell field empty, if reference is in modified
|
10 years ago |
Marc Zinnschlag
|
e32402a040
|
handle moved references on load
|
10 years ago |
Marc Zinnschlag
|
ba7b74217b
|
added original cell column to reference table
|
10 years ago |
Marc Zinnschlag
|
3b534326ff
|
forbid manual editing of the cell field in reference records
|
10 years ago |
Marc Zinnschlag
|
9f6a2d00e8
|
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
|
10 years ago |
Marc Zinnschlag
|
bdc28c0523
|
Merge remote-tracking branch 'maqifrnswa/feature1325'
|
10 years ago |
Scott Howard
|
f24c1845b6
|
remove pop-up message on load failure
|
10 years ago |
Scott Howard
|
dece4e2640
|
remove unneeded includes
|
10 years ago |
Scott Howard
|
03b39435f8
|
place user settings window at same location as mouse pointer
|
10 years ago |
Scott Howard
|
ce7cef924e
|
when loading a file fails, pop-up critical window and highlight error text
|
10 years ago |
Thoronador
|
44e01d0eaa
|
remove redundant initialization statement
See https://github.com/OpenMW/openmw/pull/423#discussion_r22403388
|
10 years ago |
Thoronador
|
91ff536460
|
fix uninit, #2
|
10 years ago |
Thoronador
|
17fb7aa598
|
uninitialized stuff
|
10 years ago |
scrawl
|
f931ba2efc
|
Fix some static analysis issues (coverity)
|
10 years ago |
Marc Zinnschlag
|
e6307a5151
|
move cursor in scripteditor to position of error
|
10 years ago |
Marc Zinnschlag
|
a64b741af2
|
store hints from operations in report model
|
10 years ago |
Marc Zinnschlag
|
3a847732b4
|
abstracted message collection into a class
|
10 years ago |
Marc Zinnschlag
|
6a67aba336
|
added double click with modifier actions in report table
|
10 years ago |
Marc Zinnschlag
|
58f4cc882f
|
added remove action to report table context menu
|
10 years ago |
Marc Zinnschlag
|
f2fc693325
|
added context menu to report table
|
10 years ago |
Marc Zinnschlag
|
350b0cb93c
|
added hidden hint column to report model
|
10 years ago |
Marc Zinnschlag
|
6c18a3b0b5
|
allow drags from report table
|
10 years ago |
Marc Zinnschlag
|
7c59ea6296
|
added specialised report table
|
10 years ago |
cc9cii
|
ab693f1f64
|
Workaround file lock being lost if the same file is closed elsewhere in the program (see https://svn.boost.org/trac/boost/ticket/3582)
|
10 years ago |
cc9cii
|
8d0cca6cfc
|
Merge remote-tracking branch 'remotes/upstream/master' into single-instance
Conflicts:
apps/opencs/editor.cpp
|
10 years ago |
Marc Zinnschlag
|
f771b95a15
|
Merge remote-tracking branch 'cc9cii/master'
|
10 years ago |
cc9cii
|
6731afc79c
|
Use float for setting skill use values. Should resolve bug #2183.
|
10 years ago |
cc9cii
|
07f10a0140
|
Use append syntax compatible with older versions of boost.
|
10 years ago |
cc9cii
|
e67cf96250
|
Allow only one instance of OpenCS. Only tested on windows x64.
|
10 years ago |
Marc Zinnschlag
|
f2d991505e
|
handle other Windows-specific path issues regarding OpenCS resources handling
|
10 years ago |
Marc Zinnschlag
|
58b6e757e3
|
fixed another case folding problem regarding OpenCS resources handling
|
10 years ago |
Marc Zinnschlag
|
406cf2b981
|
disable element visibility buttons that do not apply to the respective cell type
|
10 years ago |
Marc Zinnschlag
|
cbcd6a26d5
|
memory leak fix
|
10 years ago |
cc9cii
|
3b5cd286f6
|
Do not destroy overlay if it was never created (e.g. due to an Ogre exception).
|
10 years ago |
cc9cii
|
64e1594b41
|
Move the destruction of global resources, being used by multiple documents, to the editor.
|
10 years ago |
cc9cii
|
44b11163d1
|
Do not delete physics objects if it was never created (e.g. preview window)
|
10 years ago |
cc9cii
|
2d229c70cb
|
Another missed null shared_ptr conversion for gcc.
|
10 years ago |
cc9cii
|
9fb4b1f499
|
Initialise null shared_ptr
|
10 years ago |
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.
|
10 years ago |
Marc Zinnschlag
|
db17dbe324
|
don't store esm readers for non-base content files
|
10 years ago |
Marc Zinnschlag
|
4a9d2038fa
|
load land for non-base content files immediately
|
10 years ago |
Marc Zinnschlag
|
e177b66c1d
|
moved fog button from unpaged worldspace to worldspace
|
10 years ago |
Marc Zinnschlag
|
e04ead2bd5
|
new element visibility button icons
|
10 years ago |
Marc Zinnschlag
|
50a489321f
|
updated run button
|
10 years ago |
Marc Zinnschlag
|
d37ff8ec63
|
fixed missing tooltip update for toggle/mode-type buttons
|
10 years ago |
cc9cii
|
936094ae95
|
Set range of spinbox types in dialogsubview.
|
10 years ago |
cc9cii
|
31fdf49616
|
Use Qt exit function rather than system one.
|
10 years ago |
cc9cii
|
911839bb91
|
Simplify detecting whether a universal id represents a referenceable type.
|
10 years ago |
cc9cii
|
ede1b97b46
|
Check the type of universal id before getting its id. Should resolve bug #2137
|
10 years ago |
scrawl
|
3028141815
|
Set up ESMReader indices in OpenCS (fixes wrong terrain textures when multiple content files are loaded)
|
10 years ago |
Marc Zinnschlag
|
5eb9fd81e1
|
use placeholder icons in OpenCS when no proper icon is available
|
10 years ago |
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
|
10 years ago |
Marc Zinnschlag
|
b7f8f848a8
|
added edit modes for exteriors
|
10 years ago |
cc9cii
|
b86148411b
|
Fix for issue #2051. Not perfect (can get into a lock in some situations) but usable.
|
10 years ago |
Marc Zinnschlag
|
2acf446f18
|
added edit mode button to scene toolbar
|
10 years ago |
Marc Zinnschlag
|
b50fcd403b
|
renamed getElementMask to getVisibilityMask
|
10 years ago |
Marc Zinnschlag
|
9e67a07ad4
|
allow externally supplied ModeButtons in SceneToolMode
|
10 years ago |
Marc Zinnschlag
|
4dd645559d
|
added ModeButton specialisation of PushButton for use in SceneToolMode
|
10 years ago |
cc9cii
|
a3a0682138
|
Remove files no longer used, reverting to OEngine.
|
10 years ago |
cc9cii
|
bf669a51c1
|
Merge branch 'master' into mouse-picking-physics
|
10 years ago |
cc9cii
|
f051fb65ff
|
Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.
|
10 years ago |
scrawl
|
6b88f5f33e
|
Use Ogre::uint8, fixes a missing include for uint8_t
|
10 years ago |
scrawl
|
61d4a6b344
|
Merge branch 'openmw-033'
|
10 years ago |
scrawl
|
ba3d2be8e3
|
Add missing include (Fixes #2108)
|
10 years ago |
cc9cii
|
03abd69b4f
|
Include string header for gcc.
|
10 years ago |
cc9cii
|
7d133d508d
|
Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager.
|
10 years ago |
cc9cii
|
37a050873c
|
Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time.
|
10 years ago |
cc9cii
|
70b5d6857a
|
Add missing files.
|
10 years ago |
cc9cii
|
0e70315f91
|
Experimental, compiles and runs but crashes in some exit scenarios.
|
10 years ago |
Marc Zinnschlag
|
bf40a3bb5d
|
enhanced SceneToolBar tool handling (remove and insert at specific point)
|
10 years ago |
cc9cii
|
bd6e54dde3
|
Add function to cancel drag by pressing ESC. Remove debug code.
|
10 years ago |
cc9cii
|
092080c69c
|
Group the commands with begin/end macros.
|
10 years ago |
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.
|
10 years ago |
cc9cii
|
4556eb74fe
|
Fix saving position and rotation.
|
10 years ago |
cc9cii
|
e3a000917c
|
Minor tidy up.
|
10 years ago |
cc9cii
|
358cac2f0a
|
Fix deleting object physics again.
|
10 years ago |
cc9cii
|
d9755f82c3
|
Position saving - work in progress.
|
10 years ago |
cc9cii
|
85ef683319
|
Fix deleting physics object when scene node is cleared.
|
10 years ago |
cc9cii
|
3796240b19
|
Refactor duplicate code sections.
|
10 years ago |
cc9cii
|
49d416353e
|
Remove a redundant list.
|
10 years ago |
cc9cii
|
7f54dab6ef
|
Fix issue where objects were sometimes unresponsive after dragging.
|
10 years ago |
cc9cii
|
e174428cc5
|
Minor tweaks.
|
10 years ago |
cc9cii
|
1eed180a5c
|
Fix Gcc/MSVC differences with friend class. Invert camera derived direction.
|
10 years ago |
cc9cii
|
a21958d007
|
Add option to move the mouse against the screen frame of reference.
|
10 years ago |
cc9cii
|
89bb616cbc
|
Remove debugging code.
|
10 years ago |
cc9cii
|
8b4651f055
|
Move mouse related functions and states out of WorldspaceWidget.
|
10 years ago |
cc9cii
|
998982b16a
|
Keep physics engines until physics code is moved out of OEngine.
|
10 years ago |
cc9cii
|
c6a2461fbd
|
Delay removing physics until the document is closed. Also other general cleanup.
|
10 years ago |
cc9cii
|
1ee64c7087
|
Add missing files for multi-document support.
|
10 years ago |
cc9cii
|
b328aa1fb9
|
Multiple document support.
|
10 years ago |
cc9cii
|
057982b1f8
|
Fix Subview interface clutter by keeping a map of Scenewidgets.
|
10 years ago |
cc9cii
|
e51d532795
|
Show drag movements of objects in multiple scene managers.
|
10 years ago |
cc9cii
|
d6e67b248f
|
Fix deleting objects and scenewidgets.
|
10 years ago |
cc9cii
|
ade7f09203
|
Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.
|
10 years ago |
cc9cii
|
ac7acb2c22
|
Disable more debug code.
|
10 years ago |
cc9cii
|
4f685092fb
|
Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking
|
10 years ago |
cc9cii
|
aa7b693a13
|
Remove debug settings and minor cleanup.
|
10 years ago |
cc9cii
|
fbadaf55ee
|
Multiple SceneManagers per physics engine now working.
|
10 years ago |
cc9cii
|
a2ac4c7650
|
Allow multiple scene managers per physics engine. Compiles but does not work properly.
|
10 years ago |
cc9cii
|
0515159b74
|
Fix typo.
|
10 years ago |
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.
|
10 years ago |
Alexander "Ace" Olofsson
|
c1ce570e37
|
Use the enum value from Qt::KeyboardModifiers
This fixes the windows build at least
|
10 years ago |
cc9cii
|
792fbd119f
|
Resolve incorrect merge issues.
|
10 years ago |
cc9cii
|
c990ed4335
|
Merge branch 'mouse-picking-state' into mouse-picking
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
|
10 years ago |
cc9cii
|
6ca88dc541
|
Merge branch 'master' into mouse-picking
Conflicts:
apps/opencs/model/settings/usersettings.cpp
|
10 years ago |
cc9cii
|
8e2a0ea90a
|
Implemented moving objects around x-y plane.
|
10 years ago |
cc9cii
|
68b7532383
|
Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.
|
10 years ago |
cc9cii
|
5afaa0083f
|
Minimise false detection of grab & drag operation.
|
10 years ago |
cc9cii
|
a01a921644
|
Experimental mouse event state machine for 3d editing, starting with drag & drop objects.
|
10 years ago |
Marc Zinnschlag
|
e604fcf282
|
Merge branch 'double'
|
10 years ago |
Marc Zinnschlag
|
6f4b753750
|
replaced regular function call from SubView to View with signal-slot-connection
|
10 years ago |
Marc Zinnschlag
|
1aef9304e9
|
replaced the signal/slot user settings update with a regular function call
|
10 years ago |
Marc Zinnschlag
|
b0a7b457f7
|
made double click actions in tables configurable
|
10 years ago |
cc9cii
|
815e832dbb
|
Merge branch 'master' into mouse-picking-state
|
10 years ago |
Marc Zinnschlag
|
275bf854ed
|
added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)
|
10 years ago |
cc9cii
|
6c8320a638
|
More cleanup.
|
10 years ago |
cc9cii
|
c2c33eac0f
|
Minor cleanup.
|
10 years ago |
cc9cii
|
0b63ba5727
|
Move debug rendering code out of PhysicsSystem.
|
10 years ago |