mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 08:49:55 +00:00
Code Issues Releases Wiki Activity
13615 commits 38 branches 54 tags 122 MiB
Commit graph

1102 commits

Author SHA1 Message Date
Marc Zinnschlag
6fcf4ea9e3 In ModifyCommand replace proxy model with the source model (Fixes #2498) 2015-04-23 14:24:43 +02:00
cc9cii
82bc666e00 Make AI package items to be editable when a new row is added. 2015-04-22 09:25:55 +10:00
Marc Zinnschlag
f7c7aeecb3 fixed missing state update when starting a global search 2015-04-21 14:44:51 +02:00
cc9cii
f326b14604 Allow Qt to cleanup its signals. 2015-04-21 10:25:19 +10:00
cc9cii
18162557b0 TopicInfos result script are now displayed in dialogue subviews. 2015-04-19 13:31:16 +10:00
cc9cii
8b1ac451ac More warning fixes. 2015-04-19 09:42:44 +10:00
cc9cii
dd1e4e8b69 Remove gcc/clang warnings. 2015-04-19 08:58:52 +10:00
cc9cii
7561b195ab Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes. 2015-04-18 15:28:34 +10:00
cc9cii
f88be67556 Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate 2015-04-18 09:37:19 +10:00
cc9cii
e241fb0104 Convert clothing/armour part reference type column in the nested tables to use enum delegates. 2015-04-18 08:31:08 +10:00
cc9cii
e00d7f72ac Convert magic effects ID and Range columns in the nested tables to use enum delegate 2015-04-18 08:09:14 +10:00
cc9cii
befd6fe658 Convert magic effects Skills column in the nested tables to use enum delegates. 2015-04-18 07:15:40 +10:00
cc9cii
d6c2cff381 Convert magic effects Attribute column in the nested tables to use enum delegates. 2015-04-17 21:33:25 +10:00
cc9cii
c41b4b84a6 Cleanup post merge. 2015-04-17 13:45:45 +10:00
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
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
Marc Zinnschlag
23cf859fee added search stages (cell table only for now) 2015-03-27 16:33:54 +01:00
Marc Zinnschlag
78c6268891 added search class and search box widget 2015-03-25 11:56:14 +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