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

1184 commits

Author SHA1 Message Date
Marc Zinnschlag
50ee815dd8 make buttons in mode panel act like radiobuttons 2014-07-10 11:23:48 +02:00
Marc Zinnschlag
dd0aa20390 custom push button 2014-07-10 11:03:55 +02:00
Marc Zinnschlag
930f782bc5 SceneWidget::setLighting was missing an update call 2014-07-10 10:09:21 +02:00
Marc Zinnschlag
3333f67830 removed a left-over marker 2014-07-08 12:53:25 +02:00
Marc Zinnschlag
03f67cd6bd moved low level widgets from CSVWorld into a separate namespace/directory 2014-07-08 12:39:12 +02:00
Marc Zinnschlag
1548f4670a drop part of resources drag and drop 2014-07-08 09:51:17 +02:00
Marc Zinnschlag
b6c5ee125d more refactoring 2014-07-08 09:24:05 +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
Marek Kochanowicz
3262f8d774 make dtor virtual 2014-07-07 10:27:48 +02:00
Marek Kochanowicz
acc8432705 fixed segfault 2014-07-07 10:23:40 +02:00
Marc Zinnschlag
19828df799 added subviews for resources tables 2014-07-05 15:51:17 +02:00
Marc Zinnschlag
b2c957a56f added resources tables 2014-07-05 15:50:47 +02:00
Marc Zinnschlag
42db9a5091 make modification column optional in table views 2014-07-05 15:50:17 +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
Marek Kochanowicz
3ebc469f04 prepering for merge 2014-06-30 20:06:18 +02:00
Marc Zinnschlag
4f08efc4d7 added missing combat, magic and stealth columns for creatures (Feature #1312) 2014-06-30 19:51:59 +02:00
Marc Zinnschlag
a25321f07e update paged scene view according to changes made to cell records 2014-06-30 17:57:38 +02:00
Marc Zinnschlag
5fb2e1a877 do not render deleted exterior cells in scene view 2014-06-30 17:33:03 +02:00
Marek Kochanowicz
6dc199743c store undoStack in the nestedtable 2014-06-30 16:03:38 +02:00
Marek Kochanowicz
c96d48fb91 Nested model supports editing now. 2014-06-30 14:12:57 +02:00
Marek Kochanowicz
5eac32e3d3 added nestedtable for displaying nested content. 2014-06-30 13:09:10 +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
Marek Kochanowicz
8c6a0d9a4f created new files 2014-06-29 21:12:31 +02:00
Marc Zinnschlag
2fe2def64c added cell rendering in paged worldspaces 2014-06-29 16:00:06 +02:00
Marc Zinnschlag
a6626b94c8 added cell rendering in unpaged worldspaces 2014-06-29 14:19:10 +02:00
Marc Zinnschlag
74ed9cbb2d added cell rendering class 2014-06-29 14:18:46 +02:00
Marc Zinnschlag
c35b87de95 various Object class fixes 2014-06-28 11:25:28 +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
099c406226 Merge branch 'objects' 2014-06-27 11:55:28 +02:00
Marc Zinnschlag
6020edf60f make preview watch for changes in modification state of relevant records 2014-06-27 11:55:02 +02:00
Marc Zinnschlag
a2f514f024 disabled preview function for deleted records 2014-06-27 11:38:34 +02:00
Marc Zinnschlag
36c1170d09 fixed some function names 2014-06-27 10:35:00 +02:00
Marc Zinnschlag
0c1ad54e68 refactored object rendering into a separate class 2014-06-27 09:12:26 +02:00
scrawl
e19bbfd1b5 Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text (Fixes #1543) 2014-06-26 20:49:22 +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
slothlife
9ea22324f7 Fix some MSVC warnings. 
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
 2014-06-23 01:13:30 -05: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
bbe7854968 Corrected formatting to follow our standard better. 2014-06-17 10:46:54 +02:00
Marek Kochanowicz
d6288a8055 Remove unneded revert and delete slots 2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a refactoring dialogue subview 2014-06-16 11:31:57 +02:00
Marek Kochanowicz
7eb82f74ae Fixed complitaion. 2014-06-16 10:22:14 +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
scrawl
3bf599248e CMake cleanup: Remove distribution-specific install stuff (unused) 2014-06-10 15:03:27 +02:00
Marek Kochanowicz
8763309a1b reformatting to make code easier to read 2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9 check if index is valid before attempting to use it 2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac correcting problems 2014-06-09 13:16:10 +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
6f5935edb3 subview does not store row number anymore 2014-06-09 11:37:48 +02:00
Marek Kochanowicz
21a1f6f4ae working on the issue 2014-06-09 10:35:39 +02:00