mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 11:56:39 +00:00
Code Issues Releases Wiki Activity
8408 commits 115 branches 76 tags 128 MiB
Commit graph

560 commits

Author SHA1 Message Date
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
c961abce96 added warning message to startup window 2013-09-14 14:00:07 +02:00
Marc Zinnschlag
07ff0a8de9 possible build fix for Windows 2013-09-12 20:52:05 +02:00
Marc Zinnschlag
554c44892a Merge branch 'newgame' 2013-09-10 16:45:09 +02:00
Marc Zinnschlag
e9f14449eb added AdjusterWidget 2013-09-10 16:45:01 +02:00
Marc Zinnschlag
2dc3c0ae4f integrated startup icons 2013-09-09 09:41:43 +02:00
Marc Zinnschlag
25b7cd33ea added FileWidget; fixed OpenCS configuration 2013-09-08 14:31:20 +02:00
Marc Zinnschlag
ecedb60169 splitting new game and new addon functions (new game currently not working) 2013-09-08 12:06:28 +02:00
Marc Zinnschlag
f7940d7d1a focus load document button by default in startup window 2013-09-08 11:24:06 +02:00
Marc Zinnschlag
cae5eb424d cleaned up opening the settings dialogue from a view 2013-09-08 09:33:45 +02:00
Marc Zinnschlag
efdf2961f0 open user settings dialogue centered 2013-09-08 09:28:43 +02:00
Marc Zinnschlag
0e81fb32dd hooked up edit config signal from startup window 2013-09-08 09:26:43 +02:00
Marc Zinnschlag
17bf7e59a4 added proper startup dialogue (still missing icons) 2013-09-08 09:15:26 +02:00
graffy76
a6e7cf9a8c Implementing drag and drop 2013-09-07 15:57:40 -05:00
Marc Zinnschlag
3d66f7521e Merge remote-tracking branch 'marcrbouvier/master' 2013-09-06 08:44:59 +02:00
Marc Bouvier
784cba21f2 [Feature #881] Change Tabs to Spaces 
Some of the tabs were not made of spaces, so Git defaults tabs to the
length of 8 spaces. OpenMW uses 4 spaces per tab.
 2013-09-05 23:02:51 -05: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
6cd7da6547 Merge remote-tracking branch 'marcrbouvier/master' 2013-09-03 13:47:07 +02:00
Marc Bouvier
6b11f59ed4 [Feature #881] Rename QLocalServer 
The server name should be more unique to the project so there isn't a
interprocess clash.
 2013-09-03 06:24:11 -05:00
Marc Zinnschlag
80f8024da7 allow specifying record modification status column enum via strings 2013-09-03 13:03:02 +02:00
Marc Zinnschlag
f80373a849 removed two unused files 2013-09-03 12:53:45 +02:00
Marc Zinnschlag
1744a64f77 in filters allow specifiying boolean columns as strings 2013-09-03 12:32:06 +02:00
Marc Bouvier
0ae2bb2fae [Feature #881] Code Formatting 
Code formatted to the OpenMW policy.
 2013-09-03 05:22:48 -05:00
Marc Bouvier
563bd0b430 [Feature #881] Raise OpenCS New Window After Re-execution 
The OpenCS startup window of the existing exist is raised when trying to
start a new instance. This is done by the new instance connection to the
existing instance's QLocalServer. Once the connection is established the
existing instance raises the startup window.
 2013-09-03 04:12:19 -05:00
Marc Bouvier
51332b86a1 [Feature #811] Only 1 Instance of OpenCS is Allowed 
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
 2013-09-03 01:44:21 -05: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
aa935ff03d update tables on filter record changes 2013-08-26 12:49:13 +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
51fbb0f3f4 fixed a segfault when opening views for tables that do not allow the creation of new records 2013-08-24 15:33:46 +02:00
Marc Zinnschlag
948cb0ef34 Merge remote-tracking branch 'marcrbouvier/master' 2013-08-24 15:13:07 +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
c56007cceb fixed a record counting bug (was using the wrong model) 2013-08-23 14:11:33 +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 Bouvier
2e8b0cf502 Remove Directory Paths in Qt Classes Includes 
Qt recommends that the path location not be used when including a class.
Also, this is how other files include Qt classes in the OpenCS app. This
change is for consistency only.
 2013-08-21 17:14:29 -05:00
graffy76
e6fdc7e7fd ... 2013-08-20 12:34:39 -05:00
Marc Zinnschlag
a61215dab1 some general filter parser cleanup 2013-08-20 16:04:06 +02:00
graffy76
6898321676 Reenabling features 
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
 2013-08-20 08:16:56 -05:00
graffy76
b52645bf2a Fixes to accommodate master/plugin loading 2013-08-20 03:23:32 -05:00
graffy76
e614ec3353 Fixing profile code in progress... 2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a Moved esx selector classes out of global namespace 2013-08-18 15:11:29 -05: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
graffy76
a14e0b32d8 Restructured esxselector directory 
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
 2013-08-18 09:48:13 -05:00
graffy76
45277c0082 Minor changes 
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
 2013-08-18 09:34:33 -05: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
graffy76
2878f51cd3 Reimplemented dependency selection feature 
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
 2013-08-17 19:40:28 -05:00
graffy76
b24dd5c6ac Continued migration of code to ContentSelector 2013-08-17 05:55:43 -05:00
graffy76
61602789e1 Began migrating code to ContentSelector base 2013-08-16 22:23:21 -05:00
graffy76
4c8c6d6971 Moved init code to master / plugin proxy classes 2013-08-16 21:20:48 -05:00
graffy76
7389507eb5 Created masterproxylist class 2013-08-16 21:12:30 -05:00
graffy76
49c4e1bf9e Removed master table widget 2013-08-16 18:23:02 -05:00
graffy76
84e5c2610a Implemented combobox for game file selection 2013-08-16 18:00:23 -05:00
graffy76
bfb71f23c9 Changed filter mechanism for game / addons 
Filters by number of master references, regardless of extension
 2013-08-16 17:26:23 -05: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
789a66eaa7 added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now) 2013-08-11 20:39:21 +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
661b290c49 automatically scroll table to the position of a newly created record 2013-07-29 15:00:41 +02:00
Marc Zinnschlag
82958e6514 added custom creator for cell records 2013-07-28 18:08:57 +02:00
Marc Zinnschlag
899e18b2cf report ID errors also via input field tool tips 2013-07-28 15:28:35 +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
124a70906f added creator edit lock 2013-07-28 14:51:47 +02:00
Marc Zinnschlag
32c697abc6 validate IDs entered by the user 2013-07-28 14:40:11 +02:00
Marc Zinnschlag
4f6e99c391 more compact layout for the bottom box 2013-07-28 14:00:26 +02:00
Marc Zinnschlag
00fcb79f08 moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one) 2013-07-28 13:43:16 +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
f93af52486 handling down a reference to Data and the undo stack to the creators 2013-07-27 13:28:12 +02:00
Marc Zinnschlag
fee748d4b5 added creator bar UI and cancel button 2013-07-26 21:09:23 +02:00
Marc Zinnschlag
b8ac45defe added creator to bottom box layout and re-routed add record event to bottom box 2013-07-26 18:22:31 +02:00
Marc Zinnschlag
d899cbb449 removed some junk 2013-07-26 18:14:34 +02:00
Marc Zinnschlag
ed83e2e70a added creator to bottom box; more cleanup 2013-07-26 12:51:45 +02:00
Marc Zinnschlag
6c4bdc0101 minor cleanup; less pointer usage 2013-07-26 12:42:15 +02:00
Marc Zinnschlag
ba5ca5beed replaced createAndDelete flag with a new class hierarhy (Creator) 2013-07-26 12:35:17 +02:00
Marc Zinnschlag
4327b81bc3 fixed column handling in table (had problems with filtered out columns before) 2013-07-25 14:38:53 +02:00
Marc Zinnschlag
55e7e71c11 added optional per-subview status bar 2013-07-25 14:29:56 +02:00
Marc Zinnschlag
a80e80dd94 added layout to table sub view 2013-07-23 21:59:02 +02:00
Marc Zinnschlag
7600d6c04b basic filter table 2013-07-22 21:18:47 +02:00
Marc Zinnschlag
66534a45da replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality 2013-07-21 17:53:39 +02:00
Marc Zinnschlag
0fad2e7f40 restructured main menu 2013-07-20 13:46:56 +02:00
Marc Zinnschlag
2497c18702 replaced settings change notifications for columns with a more robust implementation 2013-07-20 13:19:27 +02:00
Marc Zinnschlag
365ea11e86 Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 2013-07-18 13:51:24 +02:00
graffy76
0ae254f6a8 Fixed segfault opening tables 2013-07-18 06:31:47 -05: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
graffy76
11178cc470 Repo permissions commit fix #3 2013-07-10 21:44:25 -05:00
graffy76
bb049806df Repo permissions commit fix #2 2013-07-10 21:13:59 -05:00
graffy76
ae4e3181d9 Fixing repo permissions commit #1 2013-07-10 17:29:07 -05:00
Marc Zinnschlag
d389b70ec4 added missing case folding 2013-07-09 14:22:58 +02:00
Marc Zinnschlag
121978a69e some cleanup; added handling of deleted cells (now displayed instead of ignored) 2013-07-09 14:20:28 +02:00
Marc Zinnschlag
116320cc0d dealing with invalid regions and cells without regions 2013-07-08 17:13:58 +02:00
Marc Zinnschlag
6159724b04 build region map from records (only initial build; updates not implemented yet) 2013-07-08 16:53:08 +02:00
Marc Zinnschlag
4f05f2bddf basic region map; non-interactive for now and working with dummy data instead of real cell/region records 2013-07-08 13:12:50 +02:00
Marc Zinnschlag
de5898c953 post merge fixes 2013-07-06 18:34:14 +02:00
Marc Zinnschlag
4986b7d65d Merge branch 'master' into ref 2013-07-06 17:54:19 +02:00
Marc Zinnschlag
1c4b70805b added missing reference table columns 2013-07-06 17:41:06 +02:00
Marc Zinnschlag
9a39f32c32 store ID of cell in reference struct 2013-07-06 17:06:06 +02:00
Marc Zinnschlag
9a49125281 added references table 2013-07-06 17:03:18 +02:00
graffy76
9f6d250463 QDebug reference removal 2013-07-01 07:40:47 -05:00
graffy76
55b115935a Implemented RefRecordTypeDelegate 
Added accessor functions to CSMWorld::UniversalId for static const
sIdArg[]
 2013-06-30 07:43:58 -05:00
graffy76
9d95a38934 Implementing delegate for referenceables table Type column 
Added delegate skeleton class

Added delegate creation code in ViewManager

Added Display_RefRecordType enum to columnbase.hpp

Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp

modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
 2013-06-29 08:54:32 -05:00
Marc Zinnschlag
afb120d5ce Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-27 08:11:27 +02:00
graffy76
6deddf7229 Fixed code conventions in user settings, changed top-level page names 2013-06-26 21:18:21 -05:00
Marc Zinnschlag
8ffea60b72 some cleanup 2013-06-26 10:09:26 +02:00
Marc Zinnschlag
12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-26 09:48:51 +02:00
graffy76
f0f895ad10 Fixed settings file error message 
Errors only occur if both global and local settings files are not found.
All other file read errors fail silently.
 2013-06-25 19:32:36 -05:00
Marc Zinnschlag
99508a6eaa minor cleanup 2013-06-23 22:52:02 +02:00
mckibbenta
5803726233 modified gmst addition during creation of new base file 2013-06-23 15:19:08 -04:00
mckibbenta
16a27e28f7 inluded gmsts with default values to creation of new base files 2013-06-22 21:01:27 -04:00
graffy76
62e164b2aa Fixed load file error if no file is found 2013-06-22 07:43:28 -05:00
graffy76
a73b97d125 Fixed broken references and other bugs 
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
 2013-06-21 23:23:43 -05:00
graffy76
b3d185e421 Unsaved changes missed in previous commits 2013-06-20 18:08:53 -05:00
graffy76
f4a2cf64c2 Removed CSVSettings::SamplePage class files 2013-06-20 18:07:34 -05:00
graffy76
101c147217 Final changes for record status icon feature, incl. window size user 
preference

1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
 2013-06-20 18:06:25 -05:00
Marc Zinnschlag
94ec05c2c6 Revert "simplifying CSMWorld::CellRef" 
With the refactored collection class we can now handle the more complex load function

This reverts commit 97f421df8a.
 2013-06-18 11:27:05 +02:00
Marc Zinnschlag
5b3d2f5da1 gave Collection class its own header file and removed an unsed cpp file 2013-06-17 14:28:09 +02:00
Marc Zinnschlag
8f167a603c split IdCollection into Collection and IdCollection class 2013-06-17 14:16:26 +02:00
Marc Zinnschlag
4b2d920f9d rewrote IdCollection::load (not using private members of IdCollection anymore) 2013-06-17 13:49:32 +02:00
graffy76
f87eb67968 Fixed conflicts 
Merge branch 'cs-windows' of https://github.com/Glorf/openmw

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/model/settings/usersettings.hpp
	apps/opencs/view/settings/usersettingsdialog.cpp
 2013-06-17 06:45:44 -05:00
Marc Zinnschlag
2968b96882 added a bit more documentation 2013-06-17 13:03:32 +02:00
Marc Zinnschlag
f4e7916ec4 moved IdCollection base into its own source file pair and renamed it to Collection 2013-06-17 11:42:02 +02:00
graffy76
700d55f1fb Fixed / implemented missing features for RecordStatusDelegate 
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.

Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.

Rewrote CSMSettings::UserSettings to retain last-loaded settings.

Adjusted icon position in Record Status column

Capitalized status text

Added delegate to referenceables table
 2013-06-15 06:40:18 -05:00
Glorf
548f4d683f Globalization of user settings 2013-06-12 12:36:35 +02:00
Glorf
10165d3c6b Feature #468 2013-06-09 00:34:27 +02:00
Marc Zinnschlag
97f421df8a simplifying CSMWorld::CellRef 2013-06-08 15:50:36 +02:00
Marc Zinnschlag
1e60ad3cd6 Promoted references to a top level record internally. 
Note: This does not change the structure of the ESX format.
 2013-06-08 12:45:13 +02:00
graffy76
1d93cf09bc Cell formatting and code optimization changes 2013-05-29 21:55:19 -05:00
graffy76
35fb9b669a Final details implemented 
Png icons, alignments fixed.
 2013-05-29 06:38:35 -05:00
Marc Zinnschlag
6d0b8f7bc8 added missing include 2013-05-22 10:14:12 +02:00
Marc Zinnschlag
c626e2b257 Merge branch 'ref' 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2013-05-19 14:59:01 +02:00
Marc Zinnschlag
ca33d66ed9 added missing columns for weapon records 2013-05-19 14:44:41 +02:00
Marc Zinnschlag
2123900db5 added missing columns for NPC records 2013-05-19 13:53:47 +02:00
Marc Zinnschlag
8d78bea4aa added missing column for misc record 2013-05-18 18:55:23 +02:00
Marc Zinnschlag
862e568f9b added missing columns for Light record 2013-05-18 18:46:41 +02:00
Marc Zinnschlag
749fd418b5 added missing columns for door record 2013-05-17 15:10:41 +02:00
Marc Zinnschlag
f8c675a638 Merge remote-tracking branch 'graffy76/usersettings' 2013-05-17 10:24:52 +02:00
graffy76
3ce35e691c Commented out sample editor settings page 2013-05-16 20:43:05 -05:00
Glorf
19ce233667 Workaround for MOC compiler problem 2013-05-16 19:46:04 +02:00
Marc Zinnschlag
54f56b0515 Merge remote-tracking branch 'graffy76/usersettings' 
Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp
 2013-05-16 18:04:55 +02:00
graffy76
13242c2bd5 Eliminated code centering the initial view in the middle of the screen 2013-05-16 10:14:13 -05:00
Marc Zinnschlag
889a87982e added missing columns for creatures 2013-05-16 16:27:33 +02:00
Marc Zinnschlag
d794a62d19 added missing columns for container record 2013-05-15 17:02:34 +02:00
Marc Zinnschlag
28f2a7d2b4 added missing column for clothing records 2013-05-15 11:37:46 +02:00
Marc Zinnschlag
eba9d3e3ee added missing columns for book record 2013-05-14 14:40:06 +02:00
Marc Zinnschlag
fce9939f83 added missing columns for armor record 2013-05-14 14:33:34 +02:00
Marc Zinnschlag
7c57f2c221 added AI-related actor columns 2013-05-14 13:20:59 +02:00
Marc Zinnschlag
74d791e207 fixed auto calc column 2013-05-13 14:07:31 +02:00
Marc Zinnschlag
897e55391d added columns for tool IDs 2013-05-13 13:36:24 +02:00
Marc Zinnschlag
52d81dc9fa added columns for enchantments 2013-05-13 13:11:43 +02:00
Marc Zinnschlag
90bae2bead do not create editors for unused columns 2013-05-13 12:55:28 +02:00
Marc Zinnschlag
929b38ff6a added missing columns for apparati records 2013-05-13 12:51:27 +02:00
graffy76
c71d921f09 Moved signalUpdateEditorSettings from UserSettingsDialog to 
UserSettings.

UserSettings is now derived from QObject.
 2013-05-12 15:15:57 -05:00
graffy76
144be59735 Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00