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

1455 commits

Author SHA1 Message Date
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
greye
130349e0cd open files in binary mode when necessary 2014-05-20 08:14:29 +04:00
greye
db16bb8983 fix OpenCS saving to Unicode path destination 2014-05-19 15:52:19 +04:00
Marc Zinnschlag
8279d307c4 text encoding configuration (was using hardcoded settings before) 2014-05-12 10:32:57 +02:00
Marc Zinnschlag
5b5bf6f37e removed a redundant (and unsufficiently configured) copy of ConfigurationManager 2014-05-10 17:46:10 +02:00
Marc Zinnschlag
5b9e90744e Merge branch 'load' 2014-05-10 13:49:25 +02:00
Marc Zinnschlag
6fdbd4d3f9 minor adjustment to UniversalId 2014-05-10 13:49:19 +02:00
Marc Zinnschlag
96ca9500ca generate error messages when encounting non-critical problems during load 2014-05-10 13:47:22 +02:00
Marc Zinnschlag
95d24492de display load error messages in loading window 2014-05-10 13:18:40 +02:00
Marc Zinnschlag
aadaf7827d added load error log 2014-05-10 12:04:36 +02:00
Marc Zinnschlag
cf90da6cd8 minor fix 2014-05-08 15:23:29 +02:00
Marc Zinnschlag
6eff5ecaad Merge branch 'operations' into load 
Conflicts:
	apps/opencs/main.cpp
	apps/opencs/model/doc/document.cpp
 2014-05-08 13:17:24 +02:00
Marc Zinnschlag
205306ee3d changed message passing format from QString to a UniversalId/std::string pair 2014-05-08 12:42:29 +02:00
graffy76
0e7d40de6a Merge branch 'master' of https://github.com/OpenMW/openmw 
upstream merge
 2014-05-07 22:00:08 -05:00
graffy76
cd7983adb5 Decoupled setting definitions from the Setting class. QSettings 
implementation is now fully responsible for managing user settings.
 2014-05-07 21:59:26 -05:00
Marc Zinnschlag
21142711f0 Merge remote-tracking branch 'graffy76/master' 2014-05-07 10:35:11 +02:00
graffy76
e47e3de3d2 Removed unneeded includes, cleaned up code, added comments 2014-05-06 21:58:50 -05:00
graffy76
8fb96e1be3 Removed error code for missing opencs.ini files. 2014-05-06 19:22:45 -05:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
Marc Zinnschlag
a30d816982 fixed a mixup in CSMTools::Tools constructor/destructor 2014-05-06 11:44:20 +02:00
Marc Zinnschlag
492620c8cf handle exceptions thrown during loading and report them to the user 2014-05-06 09:39:39 +02:00
graffy76
5cba828cc9 Removed unneeded code from setting manager. Moved some code to user 
settings
 2014-05-05 06:26:00 -05:00
graffy76
74fa115d20 fixed check for missing ini files 2014-05-05 06:07:41 -05:00
graffy76
475214ab62 Implmented QSettings for loading / saving file definitions. Also 
renamed opencs.cfg to opencs.ini to follow Ini format standards
 2014-05-05 05:56:03 -05:00
Marc Zinnschlag
7f78c29bb5 Merge remote-tracking branch 'sirherrbatka/Feature#1274' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2014-05-04 14:03:56 +02:00
graffy76
3f737bbb44 implemented QDial into RangeView class 2014-05-03 22:02:16 -05:00
graffy76
4f876574c1 Implemented slider widget in rangeView class 2014-05-03 21:50:08 -05:00
graffy76
0a3ab3dcd1 Commented out "proxy selection test" demo page in user settings 2014-05-03 19:48:04 -05:00
graffy76
35d1502308 Merge branch 'master' of https://github.com/OpenMW/openmw 
merge
 2014-05-03 19:16:42 -05:00
graffy76
1c26741c56 Implemented rangeview with spinbox as only control. Simplified setting 
class constructor.
 2014-05-03 18:58:43 -05:00
Marc Zinnschlag
3fdd72f204 added cancel button to loading window 2014-05-03 16:44:50 +02:00
Marc Zinnschlag
6bc5869222 record loading progress bar 2014-05-03 15:33:35 +02:00
Marc Zinnschlag
6692d2dc72 split up load function in a start and continue part 2014-05-03 15:05:02 +02:00
Marc Zinnschlag
0b309d9ef4 Merge branch 'master' into load 
Conflicts:
	apps/opencs/view/doc/viewmanager.cpp
 2014-05-03 14:36:06 +02:00
Marc Zinnschlag
e0e2ad8316 content file loading progress bar 2014-05-03 13:01:29 +02:00
Marc Zinnschlag
e09218f164 moved load code from Document to Loader class 2014-05-03 12:07:05 +02:00
Marek Kochanowicz
ea1aaef8ca replace paged with unpaged (and vice versa) 2014-05-01 18:25:28 +02:00
Marc Zinnschlag
ab94e70724 more cleanup of document setup 2014-05-01 13:04:48 +02:00
Marek Kochanowicz
57131332f4 fixing minor issues 2014-05-01 12:34:54 +02:00
Marek Kochanowicz
d376efe30b handle dragging not-existing records 2014-04-29 19:34:06 +02:00
cc9cii
7d990abd37 OpenCS changes to allow compilation with MSVC 11.0. 2014-04-29 22:46:55 +10:00
Marc Zinnschlag
8dc6ad5059 moved new flag from setupData function to Document constructor 2014-04-29 14:27:44 +02:00
Marc Zinnschlag
5f1d2f72f6 added basic loading GUI 2014-04-29 14:17:25 +02:00
Marek Kochanowicz
853abb65c3 added new, later common, base for the regionmap and the table 2014-04-29 11:44:21 +02:00
graffy76
0d711e51b0 Converted SettingType enums to indicate widget type. 2014-04-26 21:32:36 -05:00
Marc Zinnschlag
ddb0496dca replaced return value of removeDocument with a signal 2014-04-26 13:11:27 +02:00
Marc Zinnschlag
42b332775a removed some debug statements 2014-04-25 15:30:46 +02:00
graffy76
2e06414b43 Fixed broken delegate display modes (Display Format settings). Moved 
UserSetting update functions to DataDisplayDelegate.
 2014-04-25 07:16:40 -05:00
graffy76
3f2ae950f5 Disabled view resize for open views when user setting changes. Fixed 
new view size issue to match existing user settings.
 2014-04-24 12:50:10 -05:00
Marc Zinnschlag
dbb192f084 moved loading to a separate thread 2014-04-24 15:09:25 +02:00
graffy76
4b607d658f Re-link user settings to editor main application 2014-04-22 22:19:53 -05:00
graffy76
e3384e3999 relocate support.hpp / remove support.cpp 2014-04-22 22:19:03 -05:00
graffy76
331df17b48 Added new framework files 2014-04-22 22:17:19 -05:00
graffy76
d3148555fa Delete old framework files 2014-04-22 22:16:14 -05:00
Marc Zinnschlag
e324450118 replaced return value of DocumentManager::addDocument with a signal 2014-04-21 09:02:58 +02:00
Marc Zinnschlag
86bd2f48dc removed an unused function 2014-04-20 17:28:10 +02:00
Marek Kochanowicz
fc1837e2ed fixed bug: regions can be dragged 
ps
fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
 2014-04-15 19:26:43 +02:00
Marc Zinnschlag
19b31c4146 always use the cell ID instead of the exterior coordinate fields from the original cell struct 2014-04-13 14:16:59 +02:00
Marc Zinnschlag
decd4270d9 added CellId role to RegionMap model 2014-04-13 13:59:27 +02:00
Marc Zinnschlag
d0ea23431c replaced CellIndex typedef with new CellCoordinates class 2014-04-11 10:06:16 +02:00
Marc Zinnschlag
0516d95253 added context menu with selection functions to region map 2014-04-10 22:12:09 +02:00
Marc Zinnschlag
67965ec10c added CellCoordinates and CellSelection classes 2014-04-07 13:44:43 +02:00
Marc Zinnschlag
53c4878d52 fix for inconsistent case in topic records 2014-03-27 10:01:42 +01:00
Marc Zinnschlag
1a9df4bc56 Merge branch 'preview' 2014-03-21 12:35:40 +01:00
Marek Kochanowicz
2a26ff2299 better fix 2014-03-21 12:13:54 +01:00
Marc Zinnschlag
fc8ae2b9b5 fixed encoding problems 2014-03-21 11:56:48 +01:00
Marc Zinnschlag
2128d3008c Merge branch 'master' into preview 2014-03-21 08:12:06 +01:00
Marek Kochanowicz
a692ce99fa where was my mind… 2014-03-20 20:26:53 +01:00
Marek Kochanowicz
832a10b2ac solving problems 2014-03-20 18:40:10 +01:00
Marc Zinnschlag
1a1d52c513 fixed a column ID problem 2014-03-20 14:19:50 +01:00
Marek Kochanowicz
6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
 2014-03-19 10:23:15 +01:00
Marek Kochanowicz
e1a4b64efb fixed segfault 2014-03-13 16:50:04 +01:00
Marek Kochanowicz
089732419a introduce longString 2014-03-10 17:18:29 +01:00
Marc Zinnschlag
7812427836 added Preview submenu item; fixed View issues regarding exterior cells 2014-03-10 12:44:34 +01:00
Marek Kochanowicz
08ccae6b49 handle comboboxes 2014-03-08 16:21:49 +01:00
Marc Zinnschlag
26c2f28879 replaced global world->scene menu item with individual view context menu items in cell and reference tables 2014-03-02 22:43:44 +01:00
Marc Zinnschlag
cb3994281c changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace) 2014-03-02 13:11:15 +01:00
Marek Kochanowicz
1c35a85adf fixed bugs, added extra display_type 2014-02-20 19:27:51 +01:00
Marek Kochanowicz
b788ab8b4c correcting 2014-02-20 14:10:03 +01:00
Marek Kochanowicz
fca7701359 Column titles retrived and passed to the filterbox. 2014-02-19 16:15:51 +01:00
Marek Kochanowicz
569533eeae Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 2014-02-19 11:23:53 +01:00
Marek Kochanowicz
e9664d80bd make convert enumns public static 2014-02-19 11:22:47 +01:00
Marc Zinnschlag
02c6c65705 Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-17 09:55:50 +01:00
Marc Zinnschlag
6ac64bbe15 Merge branch 'script' 
Conflicts:
	readme.txt
 2014-02-16 12:12:56 +01:00
Marc Zinnschlag
0afa61eed5 fixed referenceable-loading in case of more than one content file 2014-02-15 15:50:17 +01:00
Marc Zinnschlag
2007a3e902 improved script check error messages 2014-02-15 13:25:38 +01:00
Marek Kochanowicz
56be62b956 small reformatting 2014-02-15 13:23:51 +01:00
Marc Zinnschlag
4e04131957 fixing case broke sorting in script context 2014-02-15 13:09:43 +01:00
Marc Zinnschlag
2130ec39d6 disable warnings by default in script verifier 2014-02-15 12:58:34 +01:00
Marek Kochanowicz
b1f63947e8 Checking if the drop comes from same document. 2014-02-15 12:40:07 +01:00
Marek Kochanowicz
f3dc45f1ec long line split. 2014-02-14 15:29:10 +01:00
Marek Kochanowicz
37d262b147 Splited very long line. 2014-02-14 15:12:34 +01:00
Marc Zinnschlag
7b8802588e Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-14 14:28:30 +01:00
Marek Kochanowicz
aafde926d3 Documentation, corrections. 2014-02-14 14:04:36 +01:00
Marc Zinnschlag
e17af4231a added script verifier 2014-02-14 13:38:30 +01:00
Marc Zinnschlag
0ff744c2ff fixed CSMWorld::ScriptContext::isJournalId 2014-02-14 12:56:05 +01:00
Marc Zinnschlag
0a8ffbfb1d added missing implementation for CSMWorld::ScriptContext::getMemberType 2014-02-14 12:46:54 +01:00
Marc Zinnschlag
910d62e4b8 added missing implementation for CSMWorld::ScriptContext::getGlobalType 2014-02-14 11:59:33 +01:00
Marek Kochanowicz
1bcc6d6918 using new icon. 2014-02-13 19:14:17 +01:00
Marek Kochanowicz
2afe3f3e57 Introduced multitype icon. 2014-02-13 19:00:35 +01:00
Marek Kochanowicz
6662560cbc new displays for referencable table columns 2014-02-13 15:43:19 +01:00
Marc Zinnschlag
d6e212a02b Merge branch 'master' into script 2014-02-13 15:02:02 +01:00
Marc Zinnschlag
e9238b456d use case-insensitive sorting in columns 2014-02-13 15:01:10 +01:00
Marek Kochanowicz
09d3c7a446 Attempt to match types. Does not work at the moment. 2014-02-13 13:54:09 +01:00
Marek Kochanowicz
71b2fc1c70 Introduced method to access display type. 2014-02-13 10:55:31 +01:00
Marek Kochanowicz
5f3f867a10 Implemented convertEnums function 2014-02-13 10:21:49 +01:00
Marek Kochanowicz
c142089bfe Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 2014-02-12 13:13:32 +01:00
Marek Kochanowicz
c00834a8de added some iostream garbage. 2014-02-12 13:12:58 +01:00
Marek Kochanowicz
8dfdd87a07 Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop 
Conflicts:
	apps/opencs/view/world/table.cpp
 2014-02-12 12:12:53 +01:00
Marek Kochanowicz
62c9c77ddf Compiles now. 2014-02-12 11:42:19 +01:00
Marek Kochanowicz
e1a39b8388 Replaced some display_string with specific type. Damn, i wish this is correct ;-) 2014-02-12 09:24:08 +01:00
Marek Kochanowicz
fc135fbfee Added new Display types 2014-02-12 09:04:52 +01:00
Marc Zinnschlag
3b990795c4 added access to remote access of local variables of global scripts 2014-02-10 14:45:55 +01:00
gus
b5006c5dbd compile fix 2014-02-09 15:33:00 +01:00
Marek Kochanowicz
f01b02c42d Changed format. 2014-02-05 11:24:33 +01:00
Marek Kochanowicz
76b729ac9b Removed getUniversalid interface. 2014-02-05 11:19:55 +01:00
Marek Kochanowicz
04287cb87a Provide method to return whole data vector from tablemimedata. 2014-02-04 19:42:52 +01:00
Marek Kochanowicz
3439940a8e Tablemimedata able to handle vector of objects and return icon. 2014-02-04 18:38:31 +01:00
Marek Kochanowicz
423b2906be Yes, you can drag. But not drop. 2014-02-04 11:40:48 +01:00
Marek Kochanowicz
dc80bfff55 Attempt to get basic tablemimedata subclass. 2014-02-04 09:13:40 +01:00
Marc Zinnschlag
914ab1b8ab allow 'x' instead of 'getjournalindex x' 2014-02-02 15:08:27 +01:00
Marek Kochanowicz
a36cc26434 Created new files for TableMimeData class. 2014-02-01 19:06:41 +01:00
Marc Zinnschlag
1b5301eec0 Merge branch 'savedgame' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
 2014-02-01 18:16:32 +01:00
Marc Zinnschlag
1d34f5e096 Merge remote-tracking branch 'sirherrbatka/cloning' 
Conflicts:
	apps/opencs/model/world/refiddata.cpp
 2014-01-28 12:40:14 +01:00
Marek Kochanowicz
2bd98a69ab Corrections, according to the comments. Thanks for the review. :-) 2014-01-28 11:16:48 +01:00
Marek Kochanowicz
62ea0bb066 Cleared whitespaces. 2014-01-27 19:40:05 +01:00
Marek Kochanowicz
c82db915f1 Removed needless includes 2014-01-27 19:32:51 +01:00
Marek Kochanowicz
d0b07de7ef Corrected bug mentioned by zini. 2014-01-27 16:59:18 +01:00
Marek Kochanowicz
9c579dbd6c ok, that should be enough 2014-01-27 15:03:29 +01:00
Marek Kochanowicz
84e07c95b1 formatting 2014-01-27 15:02:29 +01:00
Marek Kochanowicz
51115fa5be spaces around operators 2014-01-27 14:56:57 +01:00
Marek Kochanowicz
c91ae86084 is there something that can generate diff from two git branches? Using github for this is kinda annoying. 2014-01-27 14:53:39 +01:00
Marek Kochanowicz
52176d6435 reforfucking 2014-01-27 14:51:57 +01:00
Marek Kochanowicz
2b71568bb6 still reformating 2014-01-27 14:50:36 +01:00
Marek Kochanowicz
316debb827 reformating 2014-01-27 14:46:58 +01:00
Marek Kochanowicz
4d6fb31610 reformating 2014-01-27 14:45:07 +01:00
Marek Kochanowicz
2899f04a3f reformatting 2014-01-27 14:43:12 +01:00
Marek Kochanowicz
6a0b5defd7 removed needless member value. 2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8 Removed pointless includes. 2014-01-27 13:36:01 +01:00
Marek Kochanowicz
aa6d1ff4c3 removed needless argument for cloning 2014-01-27 13:08:14 +01:00
Marek Kochanowicz
be8b978a89 corrected mistake in data 2014-01-27 12:23:03 +01:00
Marek Kochanowicz
62c2259c87 removing coordinates handling 2014-01-27 10:10:23 +01:00
scrawl
03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-24 18:28:35 +01:00
Marek Kochanowicz
01be9386d6 Id to the coordinates with the boost and explicit specialisations of template member functions. 2014-01-24 11:22:20 +01:00
Marek Kochanowicz
1b1ecafdd8 introduced missing columns to data 2014-01-23 15:13:37 +01:00
Marek Kochanowicz
4d9d31b25e refrences cloning does not work 2014-01-23 09:41:09 +01:00
Marek Kochanowicz
b3b51992ef copying references. 2014-01-21 21:37:21 +01:00
Marek Kochanowicz
bc0130f8d8 do not double check if record is deleted 2014-01-21 10:35:08 +01:00
Marek Kochanowicz
9b56b6585b Cloning works for referencables as well. 2014-01-21 09:43:02 +01:00
Marek Kochanowicz
d0a52b7b24 mostly refreshing view. 2014-01-20 18:28:06 +01:00
Marek Kochanowicz
92ee252eef Small correction. 2014-01-20 16:39:42 +01:00
Marek Kochanowicz
5a52715701 implemented check for deletion. But it seems flawed. 2014-01-20 15:58:19 +01:00
Marek Kochanowicz
38636fab9a added setId to adapter 2014-01-20 14:38:20 +01:00
Marek Kochanowicz
a45339bbe6 lower case in command, not in the collection 2014-01-20 14:14:59 +01:00
Marek Kochanowicz
33620a001b Cloning works for single record type tables. Well, kinda. 2014-01-20 13:59:00 +01:00
Marek Kochanowicz
0ea2bb7c4c Working on commands 2014-01-19 16:49:39 +01:00
scrawl
805843d7ff Closes #1086: Implement blood effects 2014-01-17 11:27:13 +01:00
Marc Zinnschlag
bf1a37dc38 Merge remote-tracking branch 'sirherrbatka/referencables_verifer' 2014-01-15 14:29:54 +01:00
Marek Kochanowicz
6224344957 Being any idiot is hard. 2014-01-15 12:52:38 +01:00
Marek Kochanowicz
3d722ba104 Corrected brackets. 2014-01-15 11:59:11 +01:00
Marek Kochanowicz
fbcb1a14fc ooops, using search id 2014-01-15 11:12:56 +01:00
Marek Kochanowicz
89d4a90c06 Localised version of morrowind will no longer spam false positives. Don't check diff, please. 2014-01-15 10:30:43 +01:00
greye
15d946415e minor cleanup 
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
 2014-01-14 12:46:53 +04:00
Marek Kochanowicz
c981a2a6f8 Removed boost in favor of #include <components/misc/stringops.hpp>. Hopefully this will make scrawl happy. :P 2014-01-14 09:25:03 +01:00
Marek Kochanowicz
2c1ef610b9 Moving back to boost for case insensitive comparsion. 2014-01-14 09:16:59 +01:00
Marek Kochanowicz
e34cb9e931 changed according to the scrawl sugestion 2014-01-13 19:17:03 +01:00
Marek Kochanowicz
59de794e58 Creature check was not invoked. 2014-01-13 19:02:23 +01:00
Marek Kochanowicz
17cc6a695c fixed bug resposnsible for exception throwed. 2014-01-13 18:34:28 +01:00
Marek Kochanowicz
cb0d3794f7 Final check is not performed with just +1! Something is not right. 2014-01-10 11:01:29 +01:00
Marek Kochanowicz
688488de62 replaced == operator for string comparsion in npc check with boost algorithm to get case insensitive check. 2014-01-10 10:43:03 +01:00
Marek Kochanowicz
31c59db71c Splited another long line in the header. 2014-01-10 10:22:18 +01:00
Marek Kochanowicz
468b9d7340 camel case in the header 2014-01-10 09:50:56 +01:00
Marek Kochanowicz
e4d637fd64 splited long lines in the header. 2014-01-10 09:49:05 +01:00
Marek Kochanowicz
b98cdabe89 Shameful bug fixed. 2014-01-10 09:42:36 +01:00
Marek Kochanowicz
b85fe2becf Changes according to the comment. 2014-01-06 23:37:18 +01:00
Marc Zinnschlag
fefaec5804 Merge remote-tracking branch 'scrawl/savedgame' into savedgame 2014-01-06 22:30:08 +01:00
Marek Kochanowicz
06f8537087 added final check for player npc. Removed useless includes. However, this code spams exceptions and I can't figure out why. 2014-01-06 18:43:44 +01:00
Marc Zinnschlag
43dd3b8ef2 removed redundant deletion flag from CellRef 2014-01-06 13:53:20 +01:00
scrawl
62774fcc4a Merge branch 'master' into HEAD 
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
 2014-01-06 00:23:17 +01:00
Marek Kochanowicz
c69814ed14 corrected one, additional name to follow policy 2014-01-05 18:00:49 +01:00
Marek Kochanowicz
4338706307 static is a keyword. renamed static to staticElement 2014-01-05 17:31:54 +01:00
Marek Kochanowicz
80d424591f npc instead of NPC. 2014-01-05 17:28:47 +01:00
Marek Kochanowicz
693c398204 forgot to save the file before comit -_-' 2014-01-05 17:05:57 +01:00
Marek Kochanowicz
873870c7ce Chainging names to comply our policy. 2014-01-05 17:04:57 +01:00
Marek Kochanowicz
c1f4a9cb0e Added proper id check. 2014-01-05 12:18:26 +01:00
Marek Kochanowicz
89d8ee62fa Removing name check from listCheck. Id can't be empty to be sure. 2014-01-05 12:12:36 +01:00
Marek Kochanowicz
220d92f865 changed ID check in leveled list to name. 2014-01-05 11:30:03 +01:00
scrawl
14b70a3ce6 Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead) 2014-01-05 01:34:35 +01:00
Marek Kochanowicz
e860717105 replaced raw values with enums. 2014-01-04 15:28:08 +01:00
Marek Kochanowicz
558690b571 implemented list of magical bolts for skipping. 2014-01-04 15:19:17 +01:00
Marek Kochanowicz
dfd1058551 Various style corrections. 2014-01-04 14:49:01 +01:00
Marek Kochanowicz
aa05ffcf60 Splited some long argument lists to the multiple lines. 2014-01-04 13:05:19 +01:00
Marek Kochanowicz
1c3296fb64 Some changes in weapons check. 2014-01-03 18:25:06 +01:00
Marek Kochanowicz
7b63e1942c style corrections 2014-01-03 11:42:49 +01:00
Marek Kochanowicz
24f090ca98 Finishing stuff. 2014-01-03 11:31:54 +01:00
Marek Kochanowicz
8201c97abf Inventory item template. 2014-01-03 09:16:41 +01:00
Marek Kochanowicz
cb723710fe Corrected stupid typo. 2013-12-30 19:24:53 +01:00
Marek Kochanowicz
79bc149c73 reverting refidata.hpp 2013-12-30 18:47:19 +01:00
Marek Kochanowicz
a7de04d0a4 reverting refiddata.cpp 2013-12-30 18:46:18 +01:00
Marek Kochanowicz
4a1987ddec correcting 2013-12-30 18:41:16 +01:00
Marek Kochanowicz
3758fe3834 reformatted 2013-12-30 13:23:16 +01:00
Marek Kochanowicz
c89608f390 Check for head and hair. Correct faction check. 2013-12-30 11:39:03 +01:00
Marek Kochanowicz
842e26b8e5 added comment 2013-12-29 21:53:33 +01:00
Marek Kochanowicz
13637e7166 Dynamic_casting, checking rank. Commented out faction check, since it will not work. 2013-12-29 21:45:09 +01:00
Marek Kochanowicz
e321d571e1 Added faction check. 2013-12-29 21:06:08 +01:00
Marek Kochanowicz
9df6d23afc removing member size values, since this does not work properly. 2013-12-29 20:15:00 +01:00
Marek Kochanowicz
bf0383fe05 Last fixes. 2013-12-28 18:07:01 +01:00
Marek Kochanowicz
147ee0ace3 small oops + added new variables to the constructor 2013-12-28 17:35:04 +01:00
Marek Kochanowicz
b9d1047ad6 Small fix for lights. 2013-12-28 16:18:16 +01:00
Marek Kochanowicz
be6e47bcb6 Corrections 2013-12-28 15:51:38 +01:00
Marek Kochanowicz
5406a70fdd still working on npc check 2013-12-28 11:34:51 +01:00
Marek Kochanowicz
da3dda896a Code compiles now 2013-12-27 22:57:36 +01:00
Marek Kochanowicz
03235bf0a2 NPC. Still WIP. 2013-12-27 22:13:55 +01:00
scrawl
33389b9b63 XDG compliant paths 2013-12-26 20:53:51 +01:00
Marek Kochanowicz
f04a727af6 removed set sizes, consted sizes, added itemleveledlist check 2013-12-26 18:40:47 +01:00
Marek Kochanowicz
1da56e1790 checkin leveled items lists 2013-12-26 18:28:24 +01:00
Marek Kochanowicz
c2993909cf added creature leveled list check 2013-12-26 18:16:54 +01:00
Marek Kochanowicz
360a939aa0 Working on leveled lists now. 2013-12-26 15:35:58 +01:00
Marek Kochanowicz
6c95cea4c4 Added ingredient check 2013-12-26 15:24:52 +01:00
Marek Kochanowicz
c1715779fa Added door check with related methods. 2013-12-26 12:59:43 +01:00
Marek Kochanowicz
e4e7d50623 Added creatureCheck. I don't know meaning of all data fields here. 2013-12-23 12:32:35 +01:00
Marek Kochanowicz
94fcea4d4d added mCreaturesSize 2013-12-22 14:46:07 +01:00
Marek Kochanowicz
32046070d5 Added getCreatures 2013-12-22 14:44:22 +01:00
Marek Kochanowicz
16af9e6986 added container check 2013-12-22 14:42:17 +01:00
Marek Kochanowicz
1a7f023237 added mContainersSize. 2013-12-22 14:35:40 +01:00
Marek Kochanowicz
dc594da0de added getContainers 2013-12-22 14:34:29 +01:00
Marek Kochanowicz
bbcaef8e42 Added armor check and related stuff. 2013-12-22 14:32:42 +01:00
Marek Kochanowicz
97fc8acbdb Added armor check 2013-12-22 14:22:03 +01:00
Marek Kochanowicz
955fe3e8cf Added check for non-positive quality of alchemical apparatus 2013-12-22 10:00:04 +01:00
Marek Kochanowicz
1811f0a71b Works, but it seems that I miss something in referencables. I will write post on the forum. 2013-12-21 15:40:39 +01:00
Marek Kochanowicz
a27441720e Added enchantmnet check for books. 2013-12-21 12:07:40 +01:00
Marek Kochanowicz
ee5dfd1cc8 Adde potionCheck method 2013-12-21 11:15:46 +01:00
Marek Kochanowicz
21ee2a6d2e Getting size of potions. 2013-12-21 11:02:58 +01:00
Marek Kochanowicz
a6c36e2377 Small optimization. 2013-12-21 11:01:40 +01:00
Marek Kochanowicz
385824aee0 Renamed getActivator to getActivators. 2013-12-21 10:59:13 +01:00
Marek Kochanowicz
4842c56cb5 added getpotions 2013-12-21 10:58:05 +01:00
Marek Kochanowicz
f69465d7e0 Added aditional checks for books. Activator check. 2013-12-20 22:31:17 +01:00
Marek Kochanowicz
8085fcc792 Added Referencable checks class, added method to get refidcontainer, added method to get mBooks. 
Currently only books are checked, and only if name is present.
 2013-12-20 20:02:42 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
Marc Zinnschlag
16e2d67b1f added overloaded start/endRecord functions to ESMWriter 2013-12-01 13:32:11 +01:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45:41 +01:00
Marc Zinnschlag
1c020b74c8 hid ID column in info tables (not relevant for the user) 2013-11-14 13:14:37 +01:00
Marc Zinnschlag
2af7f60488 flag reordered records as modified 2013-11-14 12:21:10 +01:00
Marc Zinnschlag
780ea3a41f added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +01:00
Marc Zinnschlag
68598f9b63 fixed handling of user directory defaultfilters file; some cleanup 2013-11-13 14:56:04 +01:00
Marek Kochanowicz
821d0c5c2d Corrected filter template loading. 2013-11-13 11:38:29 +01:00
Marc Zinnschlag
2fff7fc843 save info records 2013-11-11 12:21:26 +01:00
Marc Zinnschlag
8c4303399f Merge branch 'master' into dialogue 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp
 2013-11-10 13:21:39 +01:00
Marc Zinnschlag
583f1ae9c2 fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection 2013-11-10 13:00:46 +01:00
Marc Zinnschlag
ec6018928c some fixes to info record sorting (doesn't address the main problem) 2013-11-10 12:09:49 +01:00
Marc Zinnschlag
935d9241d8 first attempt at proper info record loading: partially incorrect and way too slow 2013-11-09 11:42:19 +01:00
Marc Zinnschlag
3d8da2b9e0 proper sorting for newly created records and some case smashing fixes 2013-11-08 12:16:41 +01:00
Marc Zinnschlag
982024a328 Topic range access in InfoCollection 2013-11-08 11:52:30 +01:00
Marc Zinnschlag
c545b3682a compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique) 2013-11-05 12:57:55 +01:00
Marc Zinnschlag
2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88 added missing columns to topic info table 2013-11-05 11:41:48 +01:00
Marc Zinnschlag
4724df7e9b added topic/journal column to info tables 2013-11-03 10:48:50 +01:00
Marc Zinnschlag
15b7d3263c subclass ESM::DialInfo to keep track of parent topic 2013-11-01 17:43:45 +01:00
Marc Zinnschlag
90aa8f9db6 fixed dialogue record loading with multiple content files 2013-10-31 13:11:15 +01:00
Marc Zinnschlag
767cb54e7c added missing columns to journal info table 2013-10-31 12:54:55 +01:00
Marc Zinnschlag
69f28ee4be split info records between journal and topic info tables 2013-10-31 12:16:45 +01:00
Marc Zinnschlag
ba88c94d58 first attempt at an info record collection 2013-10-29 13:18:22 +01:00
Marc Zinnschlag
45f5a66bcc use result of getAppendIndex instead of always appending at the end 2013-10-29 09:27:23 +01:00
Marc Zinnschlag
9a80e11182 reimplemented add and appendBlankRecord via insertRecord 2013-10-27 14:13:10 +01:00
Marc Zinnschlag
525d6fadec added Collection insert function for arbitrary position and reimplemented appendRecord in via this function 2013-10-27 14:00:25 +01:00
graffy76
ba365ff49e Fixed merge conflicts with saving branch 2013-10-25 19:23:03 -05:00
Marc Zinnschlag
dc473221e7 added ID-argument to CollectionBase::getAppendIndex (required for info record collection) 2013-10-22 11:21:12 +02:00
Marc Zinnschlag
3146af34d6 some fixes for the merged filter branch 2013-10-21 19:28:57 +02:00
Marc Zinnschlag
fdba029566 Merge remote-tracking branch 'sirherrbatka/filters' into saving 2013-10-21 18:59:12 +02:00
Marek Kochanowicz
70602c2c36 Removed changes in the unimplemented copy ctor. 2013-10-21 18:24:16 +02:00
Marek Kochanowicz
5e1bdd605b Corrected formatting in document.hpp 2013-10-21 18:15:26 +02:00
Marc Zinnschlag
743c6ea5b1 save dialogue records 2013-10-21 16:47:32 +02:00
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
Marc Zinnschlag
3b85d97087 handle deleted dialogue records 2013-10-21 15:38:13 +02:00
Marc Zinnschlag
dc12648a3e add fixed dialogue records when creating a new omwgame file 2013-10-21 14:26:54 +02:00
Marc Zinnschlag
0be157efea set dialogue type for newly created dialogue records 2013-10-21 13:39:13 +02:00
Marc Zinnschlag
75c5316ad7 added dialogue type column to topics table 2013-10-20 17:26:09 +02:00
Marc Zinnschlag
adf3a41a83 added topic and journal tables 2013-10-20 17:15:32 +02:00
Marc Zinnschlag
ebf7732912 some cleanup 2013-10-20 15:48:39 +02:00
Marek Kochanowicz
96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 2013-10-20 10:56:27 +02:00
Marek Kochanowicz
184456892b Added check to load custom filters set when present. 2013-10-19 18:43:47 +02:00
Marek Kochanowicz
a7002e8a09 Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work. 2013-10-17 18:21:41 +02:00
Marc Zinnschlag
db7ea30483 allow float values in cell for value tests 2013-10-14 11:15:36 +02:00
Marc Zinnschlag
679754b305 corrected an error message 2013-10-14 11:06:59 +02:00
Marc Zinnschlag
9b0766b678 minor fix in ValueNode::toString 2013-10-14 10:58:11 +02:00
Marc Zinnschlag
4905f1c8ab make testing empty cells against an empty string yield true 2013-10-13 21:54:36 +02:00
Marc Zinnschlag
b8ae195a46 Merge branch 'scene' 2013-10-13 15:42:27 +02:00
Marc Zinnschlag
b5d620a8dc fixed string filter on enum column when column is empty 2013-10-12 16:35:59 +02:00
Marc Zinnschlag
a29b8667ef fixed string filter on boolean columns when testing against the value false 2013-10-12 16:29:36 +02:00
Marc Zinnschlag
a77044cda4 fixed column numbering 2013-10-12 16:15:47 +02:00
Marc Zinnschlag
9ea092927f added basic scene subview (no functionality yet) 2013-09-28 09:25:54 +02:00
Marc Zinnschlag
6143ec33e0 giving Documents direct access to ConfigurationManager 2013-09-27 15:24:58 +02:00
Marc Zinnschlag
e7c48cbe58 load project files 2013-09-27 15:04:30 +02:00
Marc Zinnschlag
62148b3247 moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase 2013-09-27 15:04:09 +02:00
Marc Zinnschlag
baae548106 added project scope filter saving 2013-09-27 13:56:40 +02:00
Marc Zinnschlag
6ac4dedfbe added missing column enum 2013-09-27 13:56:23 +02:00
Marc Zinnschlag
6f2c418a5c (slightly) improved error reporting during save operations 2013-09-27 13:54:51 +02:00
Marc Zinnschlag
23095ec3ec added missing scope column to filter table 2013-09-27 13:54:21 +02:00
Marc Zinnschlag
5779f799ab create project file when saving content file 2013-09-27 11:36:06 +02:00
Marc Zinnschlag
1363e86828 made verifier ignore deleted records 2013-09-27 10:08:09 +02:00
Marc Zinnschlag
96fd1c35bf preserve author/descriptin meta data 2013-09-24 17:17:01 +02:00
Marc Zinnschlag
830530bd06 set record count in TES3 header 2013-09-24 17:08:24 +02:00
Marc Zinnschlag
e4fdebc85b added saving for referenceable records 2013-09-24 13:53:19 +02:00
Marc Zinnschlag
c42e74dadf make 4 byte record type accessable from record struct 2013-09-24 13:17:28 +02:00
Marek Kochanowicz
ae5e8b95ff Solving Issue912 2013-09-23 20:12:04 +02:00
Marc Zinnschlag
6d9ff39390 set dependencies when saving (requires further refinements) 2013-09-23 12:16:56 +02:00
Marc Zinnschlag
d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 2013-09-23 10:09:43 +02:00
Marc Zinnschlag
f2875e234c added missing position columns to reference table 2013-09-22 10:43:09 +02:00
Marc Zinnschlag
ba5e2a0330 changed ID listing to include deleted records by default 2013-09-19 13:42:19 +02:00
Marc Zinnschlag
9c751ae370 separate highlight colour for IDs 2013-09-19 12:30:42 +02:00
Marc Zinnschlag
3d2281fe80 added signals and functions to Data for handling ID list changes 2013-09-19 12:11:27 +02:00
Marc Zinnschlag
acfd78c62a implemented saving for all supported record types except cells, referencables and references 2013-09-16 14:17:04 +02:00
Marc Zinnschlag
03054c8160 forgot to write record ID 2013-09-16 14:10:05 +02:00
Marc Zinnschlag
bf0fba68af added save stage for globals 2013-09-16 12:51:57 +02:00
Marc Zinnschlag
db70095148 write TES3 header 2013-09-15 15:31:44 +02:00
Marc Zinnschlag
231419028d minor fix 2013-09-15 15:03:17 +02:00
Marc Zinnschlag
fa25a068a8 basic saving (no data is written to file yet) 2013-09-15 15:00:41 +02:00
Marc Zinnschlag
8326ac9b6f replaced dummy save implementation with a threaded dummy save implementation 2013-09-15 12:53:59 +02:00
Marc Zinnschlag
d71d282952 more Operation enhancements in preparation for save operation 2013-09-15 12:03:36 +02:00
Marc Zinnschlag
414e6abb95 more signal cleanup 2013-09-15 11:35:12 +02:00
Marc Zinnschlag
a5aebfb760 minor cleanup 2013-09-15 09:32:20 +02:00
Marc Zinnschlag
b7bffc8a79 removed Verifier class (using Operation class without subclassing now) 2013-09-14 15:16:31 +02:00
Marc Zinnschlag
f4c03c6a29 added ordered-flag to Operation (currently ignored) 2013-09-14 15:12:24 +02:00
Marc Zinnschlag
077a157841 moved Operation and Stage from model/tools to model/doc 2013-09-14 14:56:23 +02:00
Marc Zinnschlag
e9f14449eb added AdjusterWidget 2013-09-10 16:45:01 +02:00
Marc Zinnschlag
dc345dd43d Merge branch 'filter' 2013-09-05 15:47:52 +02:00
Marc Zinnschlag
8f0ab29a9f allow the use of keywords for strings without quotation marks 2013-09-05 15:47:38 +02:00
Marc Zinnschlag
645b50ef36 added support for half-sided intervals to filter parser 2013-09-05 15:38:28 +02:00
Marc Zinnschlag
f3ce9c22a1 rewrote value node to support half-sided intervals (meaning infinity or -infinity for the missing half) 2013-09-05 15:22:14 +02:00
Marc Zinnschlag
9332684335 allow the use of value types in string filters 2013-09-05 15:05:49 +02:00
Marc Zinnschlag
f2e86e860e allow the use of record types in string filters 2013-09-05 14:39:56 +02:00
Marc Zinnschlag
8bebe7179c some UniversalId fixes 2013-09-05 13:58:36 +02:00
Alexander "Ace" Olofsson
5e42c73356 Better fix for unshield, comments on changes, no more commented out code. 2013-09-05 10:39:17 +02:00
Alexander "Ace" Olofsson
22a5f7198f A few fixes to build on Windows 2013-09-04 23:25:47 +02:00
Marc Zinnschlag
842a616909 more cleanup 2013-09-03 14:18:34 +02:00
Marc Zinnschlag
80f8024da7 allow specifying record modification status column enum via strings 2013-09-03 13:03:02 +02:00
Marc Zinnschlag
1744a64f77 in filters allow specifiying boolean columns as strings 2013-09-03 12:32:06 +02:00
Marc Zinnschlag
9cb121bd04 allow specifying enums as text in filters 2013-09-02 12:23:19 +02:00
Marc Zinnschlag
649ef6f120 moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now) 2013-09-02 11:58:05 +02:00
Marc Zinnschlag
9f0b34eae0 fixed reference loading code (editor) 2013-08-29 13:27:54 +02:00
Marc Zinnschlag
26b3d93293 streamlined filter syntax 2013-08-27 18:58:23 +02:00
Marc Zinnschlag
2e9948e86a improved one-shot filter handling; allow empty pre-defined filters 2013-08-26 14:40:34 +02:00
Marc Zinnschlag
20bd0707dc avoid use of column number literals 2013-08-26 12:25:52 +02:00
Marc Zinnschlag
937f5b11a2 fixed broken record deletion 2013-08-26 12:25:19 +02:00
Marc Zinnschlag
d007d4dc9a allow colons in names (filter) 2013-08-24 19:12:47 +02:00
Marc Zinnschlag
7e02c9acf2 added filter text column to filter table 2013-08-24 18:53:11 +02:00
Marc Zinnschlag
25e6380884 implemented use of predefined filters 2013-08-24 17:40:00 +02:00
Marc Zinnschlag
d1516792ce made document data available to filter parser 2013-08-24 17:17:22 +02:00
Marc Zinnschlag
7aee1da5c6 fixed some columns 2013-08-24 16:51:49 +02:00
Marc Zinnschlag
78c7de440d simplified filter nodes even more 2013-08-24 14:49:05 +02:00
Marc Zinnschlag
cf58670c85 removed global filter scope (would have caused sync problems between projects) 2013-08-24 14:46:42 +02:00
Marc Zinnschlag
3cf60da5a7 added numeric value filter node 2013-08-24 14:43:38 +02:00
Marc Zinnschlag
537ab38985 fixed type in error message 2013-08-23 14:49:41 +02:00
Marc Zinnschlag
63b1df85e7 fixed string parsing 2013-08-22 15:22:39 +02:00
Marc Zinnschlag
f615a9397b made text node filter case-insensitive 2013-08-22 15:16:22 +02:00
Marc Zinnschlag
de956737fe added text filter node 2013-08-22 14:50:42 +02:00
Marc Zinnschlag
decd826208 fixed an include guard 2013-08-22 14:00:55 +02:00
Marc Zinnschlag
ba6edc55d4 added not filter node 2013-08-22 13:45:50 +02:00
Marc Zinnschlag
806e9a2888 added and and or filter nodes 2013-08-22 13:14:35 +02:00
Marc Zinnschlag
50041fc211 simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway) 2013-08-22 09:17:57 +02:00
Marc Zinnschlag
a61215dab1 some general filter parser cleanup 2013-08-20 16:04:06 +02:00
Marc Zinnschlag
c87a279444 added error reporting in the filter edit widget (change the text colour for now) 2013-08-18 17:54:18 +02:00
Marc Zinnschlag
c7e97a83e1 automatically build column map on filter change 2013-08-18 17:28:04 +02:00
Marc Zinnschlag
ea8b9ce45b apply filter to table after filter text change 2013-08-18 16:53:28 +02:00
Marc Zinnschlag
470f890a9a fixed BooleanNode constructor 2013-08-18 16:52:51 +02:00
Marc Zinnschlag
c38860fa72 added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node) 2013-08-18 14:17:18 +02:00
Marc Zinnschlag
236dc9fc43 replaced binary filter node with a n-ary node 2013-08-16 14:18:31 +02:00
Marc Zinnschlag
528e047fd5 repalced std::auto_ptr with boost::shared_ptr in filter nodes 2013-08-16 13:57:54 +02:00
Marc Zinnschlag
f5b06d5d52 basic filter tree structure 2013-08-09 14:49:05 +02:00
Marc Zinnschlag
a95715b61d added description field to filter record 2013-08-09 13:45:50 +02:00
Marc Zinnschlag
f6226e4859 added Creator class for filters 2013-08-08 15:55:23 +02:00
Marc Zinnschlag
0944338c27 avoid the use of hardcoded column numbers 2013-08-08 12:49:30 +02:00
Marc Zinnschlag
76b9d3dbc1 columns are now identified via an enum instead the name string 2013-08-07 09:36:05 +02:00
Marc Zinnschlag
d2f96deb98 renamed columns.hpp to columimp.hpp 2013-08-02 10:42:52 +02:00
Marc Zinnschlag
adb05737ee Merge branch 'master' into filter 
Conflicts:
	apps/opencs/model/world/universalid.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/subviews.cpp
 2013-07-30 15:55:50 +02:00
Marc Zinnschlag
434f97c95c fixed two missing icons 2013-07-30 12:55:02 +02:00
Marc Zinnschlag
102700a498 added specialised Creator for references 2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce added specialised Creator for referenceable records 2013-07-30 12:34:18 +02:00
Marc Zinnschlag
34c825ce52 added icons and type listing to UniversalId class 2013-07-29 16:21:42 +02:00
Marc Zinnschlag
5ec9d370cb check if ID is already in use when creating new IDs 2013-07-28 15:27:15 +02:00
Marc Zinnschlag
2d46a1db2f changed CreateCommand to work directly on the model instead of the proxy 2013-07-28 13:39:33 +02:00
Marc Zinnschlag
7600d6c04b basic filter table 2013-07-22 21:18:47 +02:00
Marc Zinnschlag
365ea11e86 Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 2013-07-18 13:51:24 +02:00
graffy76
6486f342b5 Fixed setting synchronization issue 
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
 2013-07-17 20:19:01 -05:00
Marc Zinnschlag
47f7bbd48a fixed OpenCS crash during cell loading when loading multiple ESX files 2013-07-16 12:08:35 +02:00
Marc Zinnschlag
6a5ab34971 Merge branch 'region' 2013-07-14 12:19:02 +02:00
Marc Zinnschlag
4cce466dc7 inverted region map y-axis 2013-07-13 16:34:10 +02:00
Marc Zinnschlag
c26a6f884f added region map tooltips 2013-07-12 12:55:14 +02:00
greye
29b7734b52 add qualifiers for names in templates to make gcc 4.7+ happy 2013-07-12 08:33:02 +04:00
Marc Zinnschlag
c808bf2b23 updating region map on changes to region and cell records 2013-07-11 15:05:28 +02:00
Marc Zinnschlag
b17f383c6d Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2013-07-11 09:09:52 +02:00