mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 09:53:51 +00:00
Code Issues Releases Wiki Activity
16218 commits 38 branches 54 tags 122 MiB
Commit graph

1346 commits

Author SHA1 Message Date
cc9cii
47d5eac290 Merge branch 'master' into NonTableFields 
Conflicts:
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/idtable.hpp
 2015-04-17 12:37:34 +10:00
cc9cii
32e73c3deb Add creature/item levelled lists (non table items) to dialogue subview. 2015-04-17 11:50:19 +10:00
Marc Zinnschlag
38ce074a62 Merge branch 'replace' 2015-04-16 20:11:25 +02:00
Marc Zinnschlag
4951fc477c added replace function 2015-04-16 18:50:22 +02:00
cc9cii
a2d824bfa6 Changes to support dialogue only items but in a list view via QDataWidgetMapper. 2015-04-17 01:27:36 +10:00
cc9cii
1c7ed795c2 Add creature/item levelled lists to dialogue subview. 2015-04-13 22:21:27 +10:00
cc9cii
513c3a47cb Add clothing/armor part reference table to dialogue subview. 2015-04-13 21:08:23 +10:00
cc9cii
526b53fce0 Add AI packages table to dialogue subview. Also minor bug fixes. 2015-04-13 14:14:00 +10:00
cc9cii
60e5ff8811 Remove duplicated checks and exceptions. 2015-04-13 08:03:30 +10:00
cc9cii
221c57adee Fix template syntax and travis warnings. 2015-04-13 07:05:06 +10:00
cc9cii
a976dca27b Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key... 2015-04-13 06:39:38 +10:00
cc9cii
7ccf53e750 Changed over inventory adapters. Fixed a few places where modified records were not set properly. 2015-04-12 20:03:55 +10:00
cc9cii
25261a60e5 Add potion magic effects table to dialogue subview. Integration of the adapters to RefIdCollection is incomplete. 2015-04-12 18:29:42 +10:00
cc9cii
ef84e553be Renamed some stuff. 2015-04-12 13:48:23 +10:00
cc9cii
41b368a759 Moved templated code around a bit. 2015-04-12 10:52:01 +10:00
cc9cii
4b9c9bf095 Simplify and relocate nested column definitions. 2015-04-12 08:52:09 +10:00
cc9cii
8dab2f9b14 Use human friendly strings in magic effects subtable. 2015-04-12 07:46:32 +10:00
cc9cii
a460409555 Add Spells and Enchantment magic effects table to dialogue subview. The numbers are not yet converted to strings. 2015-04-11 21:43:25 +10:00
cc9cii
49fd5afdf6 Add birthsign spells table to dialogue subview. 2015-04-11 19:17:17 +10:00
cc9cii
f939648736 Add race spells table to dialogue subview. 2015-04-11 19:05:03 +10:00
cc9cii
9c75dad1ac Why is gcc so unkind? 2015-04-11 18:21:08 +10:00
cc9cii
ea9563ad92 Add faction reactions table to dialogue subview. Fix gcc compile issues. Change nested columns to generic ones where possible. 2015-04-11 17:51:30 +10:00
cc9cii
88bc62e054 Add Region sounds table to dialogue subview. 2015-04-11 15:55:26 +10:00
cc9cii
5da2f53bec Code reorganisation to prepare for nested sound table in regions. 2015-04-11 13:54:05 +10:00
cc9cii
ce7e2e06c1 Fix editor being created for a non-editable item. 2015-04-11 13:11:20 +10:00
cc9cii
a632b2cfeb Fix editing "ID" column within nested tables in dialogue subview. 2015-04-11 11:27:48 +10:00
cc9cii
1220369da3 Changes as per feedback comments. 2015-04-11 11:26:29 +10:00
Marc Zinnschlag
3f4f008c51 another fix to display type handling 2015-04-10 13:27:34 +02:00
cc9cii
7990fab708 Fix crash when exiting via window manager on some systems. 2015-04-10 18:09:33 +10:00
cc9cii
9a564f5062 Fix undo for pathgrid points add/remove. 2015-04-10 15:28:09 +10:00
cc9cii
bc9dad3ff2 Add index columns and fix edge indexing for point deletion. 2015-04-10 07:31:01 +10:00
cc9cii
330920daa8 Fix off by one error(s). 2015-04-09 21:41:46 +10:00
cc9cii
be9f94b766 Adjust edge indexes when adding/removing points. Fix some travis warnings. 2015-04-09 21:23:02 +10:00
cc9cii
23db79ebab Fix for more gcc differences. 2015-04-09 20:53:41 +10:00
cc9cii
3a46512b7f Attempt to account for gcc differences. 2015-04-09 20:15:38 +10:00
cc9cii
860754e460 Minor formatting cleanup and comments. 2015-04-09 19:33:42 +10:00
cc9cii
05210d7f21 Nested table support for Pathgrids. 2015-04-09 19:29:03 +10:00
cc9cii
bdf0d8db22 Re-organise the inheritance structure once more in preparation for adding Pathgrid tables. 2015-04-09 19:11:19 +10:00
Marc Zinnschlag
3b408b6427 sorting out some Display enum mixup 2015-04-04 19:55:53 +02:00
cc9cii
8eaf6b068c Adding missing file. 2015-04-02 21:02:17 +11:00
cc9cii
851effb0e3 Merge branch 'master' into NonTableFields 2015-04-02 20:43:48 +11:00
cc9cii
83bcc8d451 Reorganised class inheritance structure of collections, columns and idtable model. 2015-04-02 20:19:15 +11:00
Marc Zinnschlag
66c866aec9 fixed search result formatting 2015-03-31 13:02:12 +02:00
Marc Zinnschlag
cb6caf5e39 added search-related user settings 2015-03-30 22:30:33 +02:00
Marc Zinnschlag
4928e3705f highlight (bold) search string in results 2015-03-30 12:52:08 +02:00
cc9cii
ece34a1baa Workaround for crash while exiting the application. 2015-03-30 18:14:07 +11:00
cc9cii
619b5206cd More consistency nit pick. 2015-03-30 16:41:55 +11:00
cc9cii
29ef08bb75 Spelling and other consistencies nit pick. 2015-03-30 11:53:33 +11:00
cc9cii
3d280a6ba5 Fixed the display issues of the nested tables in the dialogue subview. Needs further work but usable for now. 2015-03-30 11:19:37 +11:00
scrawl
34934f016a Remove obsoleted OpenCS settings and comment non-ported settings 2015-03-30 01:51:50 +02:00
Marc Zinnschlag
46ccd27a6d improved find result text 2015-03-29 18:16:43 +02:00
Marc Zinnschlag
e8091c4e7e added field column to report table 2015-03-29 15:28:31 +02:00
Marc Zinnschlag
416b8165cd moved getColumnId function from IdTable to IdTable base and made it virtual 2015-03-29 15:28:11 +02:00
Marc Zinnschlag
a8cdd30124 added ID column to report table 2015-03-29 13:55:31 +02:00
Marc Zinnschlag
4042b12013 changed data structure for report model 2015-03-29 13:43:11 +02:00
Marc Zinnschlag
1ec0db231c add a separate display type for ID column 2015-03-28 14:48:06 +01:00
Marc Zinnschlag
c5f1c2127d extend global search to all record and reference tables 2015-03-28 14:36:28 +01:00
Marc Zinnschlag
8e9365741f make search sub-views re-usable (clear before starting a new search) 2015-03-28 12:53:01 +01:00
Marc Zinnschlag
eaaf816dd3 simplified search rules 2015-03-28 12:05:49 +01:00
Marc Zinnschlag
128ccd8151 improved search type naming 2015-03-28 11:54:32 +01:00
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
cc9cii
111a35bc38 More strip back. 2014-09-26 07:16:34 +10:00
Marc Zinnschlag
33cd04b37d added missing sound gen table columns 2014-09-25 11:40:45 +02:00
cc9cii
d5c8ff7d73 More removal. 2014-09-25 18:15:34 +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
66852d5392 Code cleanup and revert incorrect settings. 2014-09-24 22:41:49 +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
Marc Zinnschlag
02247fe712 load and save sound gen records 2014-09-23 12:20:02 +02: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
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
cc9cii
17a74da650 Cleaned up comments and dead code. 2014-09-21 21:10:18 +10:00
cc9cii
dbd1ab05d3 Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating. 2014-09-21 20:55:52 +10:00
Marc Zinnschlag
cf5c5cbce7 Merge remote-tracking branch 'corristo/osx-openmw-launch-fix' 2014-09-20 14:13:42 +02:00
Marc Zinnschlag
9d316a8745 Merge branch 'records' 2014-09-20 13:59:45 +02:00
Nikolay Kasyanov
9f7a8462d8 Fix build & OpenCS game runner code on OS X 2014-09-20 13:42:11 +04:00
Marc Zinnschlag
7733df239e made CloneCommand a subclass of CreateCommand 2014-09-20 10:36:43 +02:00
cc9cii
5dfcd2ed01 Removed standard window size combobox. Rearranged widgets. 2014-09-19 08:29:06 +10:00
cc9cii
52354b14fc Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled. 2014-09-18 22:17:37 +10:00
Marc Zinnschlag
e93ab383ea set refnum and increment refnum counter when creating a new reference 2014-09-18 12:25:17 +02:00
Marc Zinnschlag
33243c8c16 move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction) 2014-09-18 11:37:23 +02:00
cc9cii
62d2811285 Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events. 2014-09-18 07:52:54 +10:00
U-NSFW-50TH\cc9c
ca80a2b856 Merge remote-tracking branch 'upstream/master' into opencs-settings 2014-09-17 21:00:22 +10:00
Marc Zinnschlag
41275b0af3 Merge remote-tracking branch 'cc9cii/Bug-No-1869' 2014-09-17 09:20:59 +02:00
Marc Zinnschlag
90b45e09f7 added refnum column to references tables 2014-09-16 12:48:10 +02:00
Marc Zinnschlag
f5483e76cf added refnum counter column to cells table 2014-09-16 12:30:17 +02:00
cc9cii
d679e0e012 Made more progress. Grey out disabled settings. 2014-09-16 19:50:25 +10:00
cc9cii
ffaca7a875 GUI added, but not yet functional. 2014-09-16 07:44:07 +10:00
cc9cii
ecb4154ac0 Fixed default settings logic and cleaned up comments. 2014-09-15 19:33:38 +10:00
cc9cii
0ec20b23aa Initial working version. Video/rendering options supported. No GUI yet. 2014-09-15 06:08:55 +10:00
Marc Zinnschlag
d1d861e1be Merge branch 'run' 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
 2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009 allow project scope scripts 2014-09-14 11:41:28 +02:00
Marc Zinnschlag
081588f484 add project file to content file list when running OpenMW from OpenCS 2014-09-13 20:48:24 +02:00
Marc Zinnschlag
70ee899691 Merge remote-tracking branch 'cc9cii/Bug-No-1725' 
Conflicts:
	apps/opencs/model/tools/bodypartcheck.cpp
 2014-09-12 14:37:26 +02:00
Marc Zinnschlag
b29d1d452f removed some redundant checks 2014-09-11 14:19:18 +02:00
cc9cii
f0e0494f03 Since commit 8bce460f34 negative value checks no longer make sense. Not sure what to do about Vampire flag, however. 2014-09-10 08:13:10 +10:00
Marc Zinnschlag
77e9ac8975 Merge remote-tracking branch 'cc9cii/Bug-No-1710' 2014-09-08 16:38:25 +02:00
cc9cii
724ed807c8 Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable. 2014-09-08 23:14:04 +10:00
Marc Zinnschlag
d4c27d4ce0 Merge remote-tracking branch 'mellotanica/master' 2014-09-07 10:10:54 +02:00
cc9cii
4a8fe39b2c For bug #1710. Change the ID type of mime data for filterbox drop events to Referenceable rather than using the ID's native type. 2014-09-07 06:29:09 +10:00
Rohit Nirmal
e315a72582 Remove extra semicolons at the end of some lines. 2014-09-06 13:04:52 -05:00
Marc Zinnschlag
64cf0870c6 set content files when running OpenMW from OpenCS 2014-09-06 12:24:09 +02:00
cc9cii
ab8403192c Fix typo. 2014-09-06 08:00:48 +10:00
Marc Zinnschlag
cf05d3c69f added run log 2014-09-05 13:49:34 +02:00
Marc Zinnschlag
5e022195b8 create startup script when running from OpenCS 2014-09-05 11:40:01 +02:00
Marc Zinnschlag
61a92da374 use --new-game/--skip-menu switches when running from OpenCS 2014-09-05 11:03:16 +02:00
Marc Zinnschlag
431abcb63a handle shutdown of OpenMW processes when shutting down OpenCS 2014-09-03 20:06:49 +02:00
Marc Zinnschlag
3fec253409 save first (if document was modified) before running OpenMW 2014-09-03 19:56:52 +02:00
Marc Zinnschlag
a06133a50e added failed flag to operation done signal 2014-09-03 19:14:27 +02:00
Marco Melletti
8bce460f34 loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix 2014-09-03 14:40:32 +02:00
cc9cii
fd5f814218 Trivial change from "Musics" to "Music Files" 2014-09-03 20:06:43 +10:00
Marc Zinnschlag
c88b3a1520 track state of OpenMW process and enable/disable run/stop actions accordingly 2014-09-02 11:56:35 +02:00
Marc Zinnschlag
1b4ab6e130 added OpenMW runner 2014-09-02 10:21:17 +02:00
Marc Zinnschlag
03c0cbc65a added owner global column to references table (Fixes #1695) 2014-08-30 10:13:34 +02:00
Marc Zinnschlag
0dff1fb816 fix for previous commit (was using wrong destination path) 2014-08-28 13:25:56 +02:00
Marek Kochanowicz
ea2feb0aa9 fix for bug 1672 2014-08-28 12:51:49 +02:00
Marc Zinnschlag
0b3e2775a0 fixed wording in body part verifier 2014-08-27 10:46:21 +02:00
Stanislav
bdfb0c8351 Feature #1616: Body part record verifier 2014-08-26 21:55:31 +06:00
Marc Zinnschlag
5c536d571b added script column to debug profile table (dialogue only) 2014-08-24 13:15:18 +02:00
Marc Zinnschlag
232c6c9ad3 Merge branch 'scriptedit' into run 2014-08-22 13:20:02 +02:00
Marc Zinnschlag
4e521d1aca fixed resources collection access 2014-08-17 14:21:23 +02:00
Marc Zinnschlag
fd3842d726 added flag columns to debug profile table 2014-08-15 13:22:20 +02:00
Marc Zinnschlag
775e24d2c0 save debug profiles in project files 2014-08-15 12:08:29 +02:00
Marc Zinnschlag
a5ecf2e9f0 hide record type column in resources tables 2014-08-12 11:32:38 +02:00
Marc Zinnschlag
fa9c6b19c2 removed OpenCS-specific custom Filter record struct (default ESM struct will do from now on) 2014-08-10 21:03:45 +02:00
Marc Zinnschlag
2df1079dd4 removed mScope field from Filter record (redundant now) 2014-08-10 20:49:14 +02:00
Marc Zinnschlag
0be1e3d12f removed WriteFilterStage class (functionality integrated into WriteCollectionStage) 2014-08-06 10:03:04 +02:00
Marc Zinnschlag
828536e999 generalised the concept of record scope 2014-08-06 09:53:10 +02:00
Marc Zinnschlag
4d49924025 added debug profile record table 2014-08-04 13:36:01 +02:00
Marek Kochanowicz
40edf15ab0 cleaning up the code 2014-07-31 12:18:24 +02:00
Marek Kochanowicz
c6194e7ea3 inserted additional class for nested collections 2014-07-30 22:08:55 +02:00
Marek Kochanowicz
13ee469b70 saving progress 2014-07-30 17:07:11 +02:00
Marek Kochanowicz
6a9c7c9f86 fix for bug 1672 2014-07-28 17:33:21 +02:00
Marc Zinnschlag
c9cd7fb6b7 Merge branch 'scripts' 2014-07-28 09:02:24 +02:00
Marek Kochanowicz
ade27293be handling destination for guides 2014-07-25 17:11:18 +02:00
Marek Kochanowicz
39545670a8 Added spells table (and it works!) 2014-07-25 12:09:25 +02:00
Marek Kochanowicz
864b93e745 added enums for spells 2014-07-25 11:42:02 +02:00
Marek Kochanowicz
cdac934315 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-07-25 11:13:52 +02:00
scrawl
469d2afffa Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwgui/levelupdialog.cpp
 2014-07-24 02:33:46 +02:00
scrawl
75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 2014-07-24 02:17:38 +02:00
Marek Kochanowicz
a676f6bc2c comments added 2014-07-23 20:33:52 +02:00
Marek Kochanowicz
72b129b90e Code shuffling. Created CastableHelper to store actually usefull 
function.
 2014-07-22 17:44:56 +02:00
Marek Kochanowicz
9defb188ea handle inventory in the actors 2014-07-22 13:08:32 +02:00
Marek Kochanowicz
24eb034ba3 major refactorisation 2014-07-22 10:27:45 +02:00
Marek Kochanowicz
dcd90faaef moved add nested to the helper 2014-07-21 14:58:45 +02:00
Marek Kochanowicz
427d6efd19 Moved removeNestedRow responsibility to the helper. 2014-07-21 14:49:47 +02:00
Marek Kochanowicz
c018ca43ac getting rid of the asserts 2014-07-21 14:44:48 +02:00
Marek Kochanowicz
cb004936e0 moved setNestedData to the helper as well 2014-07-21 14:34:48 +02:00
Marek Kochanowicz
6573e3f319 moved responsibility for getNestedData to the inventory helper 2014-07-21 14:24:54 +02:00
Marek Kochanowicz
c4598d6200 added inventory helper (since npc and containers share same way of 
handling items)
 2014-07-21 14:10:04 +02:00
Marc Zinnschlag
a9f9dec923 consider script blacklist in OpenCS verifier 2014-07-21 12:15:21 +02:00
Marek Kochanowicz
3dd2ca15da Reduced code duplication through new common base class 2014-07-21 09:52:09 +02:00
Marek Kochanowicz
87eed066c2 undo works now 2014-07-20 22:39:39 +02:00
Marek Kochanowicz
4d79034dbf correctly handling the nestedTable for undo (but removing and adding 
rows in proper QT way is still TODO)
 2014-07-20 18:52:35 +02:00
Marek Kochanowicz
0017fc68ef fixed ctor of nestedwrapper (missing initialization of member data field) 2014-07-19 13:08:28 +02:00
Marek Kochanowicz
1ff8abb240 store whole container representing the nested table inside of the 
command

Static nature of C++ forced me to use templates. Bit frustraiting.
 2014-07-18 18:26:22 +02:00
Marek Kochanowicz
16292bf23e removed useless todo statments. 2014-07-17 13:03:53 +02:00
Marek Kochanowicz
5671a4b8e2 corrected include to follow our standards. 2014-07-17 12:58:14 +02:00
Marek Kochanowicz
6e07568b43 Corrected syntax. 2014-07-17 12:56:51 +02:00
Marek Kochanowicz
ca73ce3fe2 trying to fix indending 2014-07-17 12:41:43 +02:00
Marek Kochanowicz
f0c6ef185e Nest columns directly, created NestedColumn class and NestColumn. 2014-07-16 13:13:22 +02:00
Marek Kochanowicz
0252d021eb removed pointless member field 2014-07-13 12:37:05 +02:00
Marek Kochanowicz
4b4a72c3b6 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 2014-07-13 10:52:39 +02:00
Marc Zinnschlag
3333f67830 removed a left-over marker 2014-07-08 12:53:25 +02:00
Marc Zinnschlag
1548f4670a drop part of resources drag and drop 2014-07-08 09:51:17 +02:00
Marc Zinnschlag
9d5956585c added separate display type for colours 2014-07-08 09:08:01 +02:00
Marc Zinnschlag
b2ce94f28a fixed exceptions 2014-07-08 08:56:28 +02:00
Marc Zinnschlag
b2c2342988 some refactoring (removing redundant code) 2014-07-08 08:53:39 +02:00
Marc Zinnschlag
c1bbefb840 enable dragging from resources tables 2014-07-07 15:20:05 +02:00
Marek Kochanowicz
72392ad68c emit data changed signal when adding and removing the nested row 2014-07-07 12:22:04 +02:00
Marek Kochanowicz
d221486a14 Fixed problem in the idtable. 2014-07-07 12:16:53 +02:00
Marc Zinnschlag
df6996d4ae filter resources files based on extension 2014-07-07 11:34:24 +02:00
Marc Zinnschlag
b2c957a56f added resources tables 2014-07-05 15:50:47 +02:00
Marc Zinnschlag
4f6c7b0e84 resolved UniversalId naming ambiguity 2014-07-05 15:07:17 +02:00
Marc Zinnschlag
e171babd2f added Feature_Constant to IdTable 2014-07-05 12:44:11 +02:00
Marc Zinnschlag
1b1f1bade3 injected new class IdTableBase between QAbstractItemModel and IdTable 2014-07-04 13:25:56 +02:00
Marc Zinnschlag
63d0fdee7f removed leftover data member 2014-07-04 12:48:18 +02:00
Marc Zinnschlag
879ab49e9c added resources manager 2014-07-04 12:46:57 +02:00
Marc Zinnschlag
1ce60fa13b Merge branch 'tables' 2014-07-03 12:03:21 +02:00
Marc Zinnschlag
1745335982 body part table fix: forgot to include body parts in ID listings 2014-07-03 12:03:01 +02:00
Marek Kochanowicz
851d2f061b Removed qdebug calls (forgot about those). 2014-07-03 11:14:51 +02:00
Marc Zinnschlag
9ce92302d7 interpret empty filter strings as no filter instead of a broken filter (Fixes #1311) 2014-07-03 10:22:39 +02:00
Marek Kochanowicz
0bfc408ea2 removed debug code 2014-07-02 14:10:11 +02:00
Marek Kochanowicz
bb675ff41d Removing rows and undo works 2014-07-02 13:29:25 +02:00
Marek Kochanowicz
77afb754e5 adding new rows works 2014-07-02 13:13:03 +02:00
Marek Kochanowicz
c50cecdc64 Small cleanup 2014-07-01 21:13:27 +02:00
Marek Kochanowicz
fcd082c6a5 added option to add or remove rows 2014-07-01 20:52:27 +02:00
Marc Zinnschlag
37a2b48fa2 added missing type columns to body part table 2014-07-01 14:28:12 +02:00
Marc Zinnschlag
d96ed38d49 added body part table 2014-07-01 12:37:22 +02:00
Marc Zinnschlag
5649552f18 added other missing columns for enchantment table; fixed dialogue subviews for enchantment records 2014-07-01 09:50:43 +02:00
Marc Zinnschlag
ab8bee4d1a added enchantment type column to enchantment table 2014-07-01 09:42:56 +02:00
Marc Zinnschlag
395c45c88b Merge branch 'editorfixes' into tables 2014-06-30 20:49:41 +02:00
Marc Zinnschlag
e97fd35ae6 added enchantments table 2014-06-30 20:40:34 +02:00
Marek Kochanowicz
172f1a1301 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 2014-06-30 20:06:44 +02:00
Marc Zinnschlag
4f08efc4d7 added missing combat, magic and stealth columns for creatures (Feature #1312) 2014-06-30 19:51:59 +02:00
Marek Kochanowicz
c96d48fb91 Nested model supports editing now. 2014-06-30 14:12:57 +02:00
Marc Zinnschlag
af59106533 for regular IdCollections when loading a record make the record a copy of the existing record first (adresses some incomplete records in some content files) 2014-06-30 12:35:34 +02:00
Marc Zinnschlag
3541d03809 fixed deleting of referenceables (modification state column was incorrectly flagged as non-editable) 2014-06-27 12:29:23 +02:00
Marc Zinnschlag
06e89d8bd3 reduced loading batch size (making the the loading progress bars a bit more responsive 2014-06-26 11:43:21 +02:00
Marc Zinnschlag
bd252d0aec display record count in loading window 2014-06-26 11:41:21 +02:00
Marek Kochanowicz
a0146e2e28 Added undo for delete command 2014-06-24 19:34:02 +02:00
Marek Kochanowicz
d73f4cbd7b added add nested command 2014-06-24 19:19:40 +02:00
Marek Kochanowicz
7b5bf637ab Changes needed to add new nested row. 2014-06-24 19:03:29 +02:00
Marek Kochanowicz
befdeb1889 use beginRemovRow when removing nested row. 2014-06-24 12:42:49 +02:00
Marek Kochanowicz
7430e1e1bb Added delete nested rows command (undo still needs to be done) 2014-06-24 12:35:26 +02:00
Marek Kochanowicz
c45061614b Added code to delete nestedRows 2014-06-24 12:21:40 +02:00
Marek Kochanowicz
88c5288eaf Create removeNestedRow (for deleting rows of nested columns) 2014-06-24 10:22:42 +02:00
Marek Kochanowicz
894c98ee89 Added extra columnid type to use for ID of the inventory item 2014-06-20 14:22:40 +02:00
Marek Kochanowicz
a076798f8f Quick and dirty prototype of actual nested header data implementation 2014-06-19 18:46:09 +02:00
Marek Kochanowicz
256b075914 getting rid of not needed abstract class 2014-06-19 16:11:31 +02:00
Marek Kochanowicz
873cfcf447 implemented basic headerData (still work in progress) 2014-06-18 17:34:21 +02:00
Marek Kochanowicz
b63f2f4cd5 Actually using new nestedmodel 2014-06-18 16:56:37 +02:00
Marek Kochanowicz
1fb18873cb adding proxy model that is ment to be used by the dialoguesubview 2014-06-18 15:35:31 +02:00
Marek Kochanowicz
75b5513c6c Column is responsible for telling that it can nest columns now. 2014-06-18 11:58:18 +02:00
Marek Kochanowicz
ce5e889015 Nested table sits inside it's own layout now. 2014-06-17 20:12:14 +02:00
Marek Kochanowicz
5bee682bb3 modified: ../../view/world/dialoguesubview.cpp 2014-06-17 14:58:25 +02:00
Marek Kochanowicz
03980034a5 Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw 
into NonTableFields

I have no idea what I'm doing

Conflicts:
	apps/opencs/model/world/idtable.cpp
	apps/opencs/model/world/refidadapter.hpp
	apps/opencs/model/world/refidadapterimp.hpp
 2014-06-17 14:21:50 +02:00
Marek Kochanowicz
defd0b1754 Merge branch 'dialog-fix' into NonTableFields 
TODO stop failing epicly with git
 2014-06-17 14:08:59 +02:00
Marek Kochanowicz
187fccc8cc Merge branch 'dialog-fix' into NonTableFields 2014-06-17 12:58:14 +02:00
Marek Kochanowicz
32fcc9ad61 Trying to merge. 2014-06-17 11:14:12 +02:00
Marc Zinnschlag
073cc3f02c fixed base flag in content file loader code 2014-06-17 11:01:17 +02:00
Marek Kochanowicz
48691136fb Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix 2014-06-16 09:44:49 +02:00
scrawl
d5b97005ab Make ESM::Faction skills optional (Fixes #1508) 
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
 2014-06-16 02:52:16 +02:00
scrawl
fd59a4a79e Fix some doxygen typos 2014-06-15 16:11:22 +02:00
Marc Zinnschlag
c23e9e03fd Merge branch 'refs' 2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c added extended versions of revert and delete 2014-06-11 11:43:38 +02:00
Marek Kochanowicz
269a357644 Merge remote-tracking branch 'master/refs' into dialog-fix 
Conflicts:
	CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/dialoguesubview.cpp
 2014-06-09 11:51:41 +02:00
Marek Kochanowicz
21a1f6f4ae working on the issue 2014-06-09 10:35:39 +02:00
Marc Zinnschlag
e4a37ef709 removed some hardcoded column numbers 2014-06-07 13:06:19 +02:00
Marc Zinnschlag
85fca19fd9 replaced selection model in CommandDispatcher with a slightly slower but more robust implementation 2014-06-07 13:02:45 +02:00
Marc Zinnschlag
f6ae967ba0 simplified Data constructor 2014-06-06 20:47:31 +02:00
Marc Zinnschlag
c6557e1ade some UniversalId cleanup and enhancements 2014-06-06 14:25:06 +02:00
Marc Zinnschlag
83d5f2aaeb factored out command creation from table view into a separate class 2014-06-06 12:43:21 +02:00
Marc Zinnschlag
1b9b275f30 fix for bug #1369 2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe simplified feature management for record tables 2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770 Revert "added changed reference tracking for cells" 
This reverts commit f4334da42e.
 2014-06-04 21:12:23 +02:00
Marek Kochanowicz
55d451febe changes in the model (idtable) to support nested data 2014-06-02 20:41:37 +02:00
Marc Zinnschlag
be7f344eca Merge branch 'refs' 
Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp
 2014-05-30 10:38:38 +02:00
Marc Zinnschlag
4778c27548 silenced two warnings 2014-05-30 10:18:05 +02:00
Marc Zinnschlag
ae50632774 implemented cell and reference saving int OpenCS 2014-05-29 18:08:40 +02:00
Marek Kochanowicz
6720d85a04 fixed compilation, thanks greye 2014-05-27 14:50:21 +02:00
Marek Kochanowicz
41db48720d does not compile 2014-05-27 14:01:15 +02:00
Marc Zinnschlag
e0ba9a4bf2 added reference collection stage to saving operation (preparation for cell saving) 2014-05-27 12:39:26 +02:00
Marek Kochanowicz
befc7a4078 adding column for the content of the container 2014-05-25 17:02:40 +02:00
Marc Zinnschlag
f4334da42e added changed reference tracking for cells 2014-05-23 09:32:34 +02:00
Marc Zinnschlag
e0b6bf6aeb implemented reference record deleting 2014-05-20 09:28:18 +02:00
Marc Zinnschlag
d8440e1fdc implemented reference record merging 2014-05-20 09:02:22 +02:00