mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 12:53:52 +00:00
Code Issues Releases Wiki Activity
13266 commits 107 branches 66 tags 133 MiB
Commit graph

80 commits

Author SHA1 Message Date
cc9cii
bdf0d8db22 Re-organise the inheritance structure once more in preparation for adding Pathgrid tables. 2015-04-09 19:11:19 +10:00
cc9cii
83bcc8d451 Reorganised class inheritance structure of collections, columns and idtable model. 2015-04-02 20:19:15 +11:00
cc9cii
29ef08bb75 Spelling and other consistencies nit pick. 2015-03-30 11:53:33 +11: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
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
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
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
9defb188ea handle inventory in the actors 2014-07-22 13:08:32 +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
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
6e07568b43 Corrected syntax. 2014-07-17 12:56:51 +02:00
Marek Kochanowicz
f0c6ef185e Nest columns directly, created NestedColumn class and NestColumn. 2014-07-16 13:13:22 +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
1548f4670a drop part of resources drag and drop 2014-07-08 09:51:17 +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
Marc Zinnschlag
3541d03809 fixed deleting of referenceables (modification state column was incorrectly flagged as non-editable) 2014-06-27 12:29:23 +02:00
Marek Kochanowicz
7b5bf637ab Changes needed to add new nested row. 2014-06-24 19:03:29 +02:00
Marek Kochanowicz
c45061614b Added code to delete nestedRows 2014-06-24 12:21:40 +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
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
defd0b1754 Merge branch 'dialog-fix' into NonTableFields 
TODO stop failing epicly with git
 2014-06-17 14:08:59 +02:00
Marek Kochanowicz
48691136fb Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix 2014-06-16 09:44:49 +02:00
Marek Kochanowicz
21a1f6f4ae working on the issue 2014-06-09 10:35:39 +02:00
Marc Zinnschlag
1b9b275f30 fix for bug #1369 2014-06-05 13:40:37 +02:00
Marek Kochanowicz
55d451febe changes in the model (idtable) to support nested data 2014-06-02 20:41:37 +02:00
Marek Kochanowicz
befc7a4078 adding column for the content of the container 2014-05-25 17:02:40 +02:00
Marc Zinnschlag
0afa61eed5 fixed referenceable-loading in case of more than one content file 2014-02-15 15:50:17 +01:00
Marek Kochanowicz
6662560cbc new displays for referencable table columns 2014-02-13 15:43:19 +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
aa6d1ff4c3 removed needless argument for cloning 2014-01-27 13:08:14 +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
33620a001b Cloning works for single record type tables. Well, kinda. 2014-01-20 13:59:00 +01:00
scrawl
805843d7ff Closes #1086: Implement blood effects 2014-01-17 11:27:13 +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
780ea3a41f added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +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
dc473221e7 added ID-argument to CollectionBase::getAppendIndex (required for info record collection) 2013-10-22 11:21:12 +02:00
Marc Zinnschlag
e4fdebc85b added saving for referenceable records 2013-09-24 13:53:19 +02:00
Marc Zinnschlag
ba5e2a0330 changed ID listing to include deleted records by default 2013-09-19 13:42:19 +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
76b9d3dbc1 columns are now identified via an enum instead the name string 2013-08-07 09:36:05 +02:00