krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
13630 commits 35 branches 0 tags 65 MiB
Commit graph

1036 commits

Author SHA1 Message Date
Marc Zinnschlag
babefacbfa improved message text in search results 2015-03-27 19:10:45 +01:00
Marc Zinnschlag
705ee67265 fixed hints getting mixed up with message text 2015-03-27 18:55:48 +01:00
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
Marc Zinnschlag
23cf859fee added search stages (cell table only for now) 2015-03-27 16:33:54 +01:00
scrawl
99e1720980 Add SceneManager and clone utility 2015-03-26 18:02:51 +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
Marc Zinnschlag
78c6268891 added search class and search box widget 2015-03-25 11:56:14 +01:00
scrawl
af27a10b0c OpenCS: preliminary port of PreviewWidget to OSG 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
Marc Zinnschlag
d053c62032 setting up global search operation and subview 2015-03-17 12:30:47 +01:00
cc9cii
76adb64e20 Compilation fix after merging commt e30f24 2015-03-16 13:21:02 +11: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
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
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
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
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
cc9cii
ca21181483 Fix typo to get table display working. 2015-03-07 11:42:50 +11: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
Marc Zinnschlag
0b70fdac57 added start script verifier 2015-03-05 11:24:01 +01: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
1ed606065c save start script records 2015-03-03 16:11:00 +01:00
Marc Zinnschlag
4e1c086d6a load start up script records 2015-03-03 14:31:59 +01:00
cc9cii
66ef9d237c Another try to make it work with gcc/travis. 2015-03-03 10:12:40 +11:00
cc9cii
7c0f5b72c5 Add enum namespace to workaround travis. 2015-03-03 08:31:06 +11:00
cc9cii
a8427c2efb Do not add NAME subrecords while saving magic effects or scripts. 2015-03-03 07:36:11 +11:00
Marc Zinnschlag
64938b3796 Merge remote-tracking branch 'cc9cii/saving-skil' 2015-03-01 10:36:26 +01:00
Marc Zinnschlag
59c7fe28d9 Merge remote-tracking branch 'naclander/master' 2015-03-01 10:23:08 +01:00
cc9cii
5ff66ad40b Fix Bug #2402. SKIL records should not have NAME subrecord. 2015-03-01 13:09:23 +11:00
scrawl
3158d34abb Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all. 2015-02-25 20:25:41 +01:00
Nathan Aclander
6d7e1242cc Fixed incorrect casting 
Only cast to strings things that are ints. Also I missed an mFactionRank to cast.
 2015-02-20 20:18:31 -08:00
Nathan Aclander
539e8276c8 Silenced clang warning by converting int to string 2015-02-19 19:05:19 -08:00
Alexander "Ace" Olofsson
a61019dfa8 Update referencecheck.cpp 
MSVC does not allow for the usage of 'and' or 'or' literals
 2015-02-15 04:47:25 +01:00
Kamil Bar
3b7a23aa72 Fixed charge checks for light and other objects, corrected CellRef charge union comments 2015-02-13 13:11:10 +01:00
Kamil Bar
9628415e21 Missing change & changed comments to represent actual code 2015-02-13 12:16:46 +01:00
Kamil Bar
52a064afc3 Fixed charges checking 2015-02-13 12:13:40 +01:00
Kamil Bar
e1314d6211 Implement OpenCS reference validation (Feature #831) 2015-02-13 04:45:18 +01:00
Alexander "Ace" Olofsson
b714e5211d Redefinition of default template argument 
Sometimes it's annoying how MSVC casually allows you to break C++ standards
 2015-02-09 17:25:55 +01:00
Alexander "Ace" Olofsson
f77ae711e4 Fix template closer 2015-02-09 17:10:09 +01:00
Alexander "Ace" Olofsson
cfcaf4528f Some more forward-declaring for OpenMW-CS 2015-02-09 16:50:34 +01:00
Marc Zinnschlag
7f905470fa fixed moved reference loading 2015-01-24 15:01:38 +01:00
Marc Zinnschlag
89998a6a03 save MVRF subrecords 2015-01-24 14:22:29 +01:00
scrawl
c7d15e6f74 Revert "Revert "Light charge handling fix"" 
This reverts commit b95748d044.
 2015-01-23 15:33:39 +01:00
scrawl
b95748d044 Revert "Light charge handling fix" 
This reverts commit 5e0428243b.
 2015-01-23 02:32:38 +01:00
Marc Zinnschlag
a97f599e65 fixed ref num saving in non-wide format 2015-01-22 13:41:09 +01:00
Marc Zinnschlag
cd62dbc5b7 Merge remote-tracking branch 'scrawl/essimporter' 2015-01-21 15:12:04 +01:00
scrawl
5e0428243b Light charge handling fix 2015-01-21 01:59:45 +01:00
Marc Zinnschlag
9670e0881d update reference's current cell when x/y-coordinates are modified 2015-01-16 15:17:52 +01:00
Marc Zinnschlag
561ddfa0c5 make column type accessable via the regular table model 2015-01-16 11:29:44 +01:00
Marc Zinnschlag
7615cbafce create modify commands through command dispatcher 2015-01-15 14:24:33 +01:00
Marc Zinnschlag
f3c7532660 cleaned up some enum confusion 2015-01-15 12:01:59 +01:00
Marc Zinnschlag
320b994aef keep original cell field empty, if reference is in modified 2015-01-10 12:35:59 +01:00
Marc Zinnschlag
e32402a040 handle moved references on load 2015-01-09 12:05:53 +01:00
Marc Zinnschlag
ba7b74217b added original cell column to reference table 2015-01-05 15:20:47 +01:00
Marc Zinnschlag
3b534326ff forbid manual editing of the cell field in reference records 2015-01-05 15:04:11 +01:00
Thoronador
44e01d0eaa remove redundant initialization statement 
See https://github.com/OpenMW/openmw/pull/423#discussion_r22403388
 2015-01-02 02:23:10 +01:00
Thoronador
91ff536460 fix uninit, #2 2015-01-02 00:26:45 +01:00
Thoronador
17fb7aa598 uninitialized stuff 2015-01-01 23:18:30 +01:00
Marc Zinnschlag
e6307a5151 move cursor in scripteditor to position of error 2014-12-08 12:29:23 +01:00
Marc Zinnschlag
a64b741af2 store hints from operations in report model 2014-12-07 20:53:09 +01:00
Marc Zinnschlag
3a847732b4 abstracted message collection into a class 2014-12-07 18:57:47 +01:00
Marc Zinnschlag
350b0cb93c added hidden hint column to report model 2014-12-06 13:45:47 +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
f2d991505e handle other Windows-specific path issues regarding OpenCS resources handling 2014-12-03 15:31:00 +01:00
Marc Zinnschlag
58b6e757e3 fixed another case folding problem regarding OpenCS resources handling 2014-12-03 15:24:37 +01:00
Marc Zinnschlag
cbcd6a26d5 memory leak fix 2014-12-01 22:57:32 +01: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
db17dbe324 don't store esm readers for non-base content files 2014-11-30 18:04:18 +01:00
Marc Zinnschlag
4a9d2038fa load land for non-base content files immediately 2014-11-30 14:33:39 +01:00
scrawl
3028141815 Set up ESMReader indices in OpenCS (fixes wrong terrain textures when multiple content files are loaded) 2014-11-18 11:47:46 +01:00
Marc Zinnschlag
5eb9fd81e1 use placeholder icons in OpenCS when no proper icon is available 2014-11-13 12:09:10 +01:00
cc9cii
bd6e54dde3 Add function to cancel drag by pressing ESC. Remove debug code. 2014-11-03 21:24:47 +11:00
cc9cii
4556eb74fe Fix saving position and rotation. 2014-11-03 10:07:21 +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
8b4651f055 Move mouse related functions and states out of WorldspaceWidget. 2014-11-02 08:22:27 +11:00
cc9cii
aa7b693a13 Remove debug settings and minor cleanup. 2014-10-31 22:04:10 +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
Marc Zinnschlag
e604fcf282 Merge branch 'double' 2014-10-27 09:56:52 +01:00
Marc Zinnschlag
b0a7b457f7 made double click actions in tables configurable 2014-10-27 09:32:02 +01: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
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
cc0acec64c Add settings to enable/disable debug rendering of mouse picking. 2014-10-25 21:02:40 +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
5a1ce4943e added advance 3D rendering user settings section 2014-10-19 13:41:56 +02:00
Marc Zinnschlag
a3c894c1e2 Merge branch 'cellmarker' 2014-10-17 14:26:16 +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
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
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
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
cc9cii
809b8c6d5b Conflicts: 
apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-10-12 05:54:21 +11: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
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
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
scrawl
8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 2014-10-08 17:17:31 +02: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
a161ad3cd5 Sort cell id column by numerical order. 2014-10-07 20:11:44 +11:00
Marc Zinnschlag
2d3ffc4483 fixed pathgrid saving 2014-10-05 15:12:12 +02:00
Marc Zinnschlag
be3b229a5f fixed pathgrid loading 2014-10-04 15:36:52 +02:00
Marc Zinnschlag
9fd82212b3 Merge remote-tracking branch 'cc9cii/opencs-settings' 2014-10-03 13:11:05 +02:00
Marc Zinnschlag
f4c9897bbd Merge branch 'master' into tables 2014-10-02 15:49:36 +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
Marc Zinnschlag
850a40d4e2 fixed resources table drag source problem 2014-09-30 13:15:15 +02:00
Marc Zinnschlag
ff530a2e19 added missing magic effect table columns 2014-09-30 12:33:48 +02:00
cc9cii
7675df60ba Fix far clip distance (again), workaround for broken settings minimum value. 2014-09-29 08:17:51 +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
303b0ee8c6 Update scenewidget when antialiasing settings change. 2014-09-28 15:43:33 +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
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