1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-28 14:53:58 +00:00

1155 Commits

Author SHA1 Message Date
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