mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 19:26:38 +00:00
Code Issues Releases Wiki Activity
12890 commits 115 branches 76 tags 128 MiB
Commit graph

1558 commits

Author SHA1 Message Date
Marc Zinnschlag
0b309d9ef4 Merge branch 'master' into load 
Conflicts:
	apps/opencs/view/doc/viewmanager.cpp
 2014-05-03 14:36:06 +02:00
Marek Kochanowicz
5e99381019 Drag and drop works. 2014-05-03 14:00:30 +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
7f1df878f6 make getDropType static and public. 2014-05-02 20:28:28 +02:00
Marek Kochanowicz
c2b070f097 trying to do it right. 2014-05-01 19:17:33 +02:00
Marek Kochanowicz
ea1aaef8ca replace paged with unpaged (and vice versa) 2014-05-01 18:25:28 +02:00
Marek Kochanowicz
d00dbf47d5 working on worldspace drops 2014-05-01 15:09:47 +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
9e01a54d72 minor correction 2014-04-30 15:17:20 +02:00
Marek Kochanowicz
6aaa15b2e8 paged worldspace drop 2014-04-30 15:03:46 +02:00
Marek Kochanowicz
19dac9dc86 that would be it 2014-04-30 14:27:11 +02:00
Marek Kochanowicz
4d79f00e28 enable dragging on the region map cells 2014-04-30 13:32:54 +02:00
Marek Kochanowicz
eeb18b533e moved editlock to the dragrecordtable 2014-04-29 21:41:57 +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
Marc Zinnschlag
2906ade531 string fix 2014-04-29 13:16:58 +02:00
Marek Kochanowicz
18fc8acc71 able to drag existing cells from the regionmap 2014-04-29 12:27:26 +02:00
Marek Kochanowicz
853abb65c3 added new, later common, base for the regionmap and the table 2014-04-29 11:44:21 +02:00
Thoronador
f69d61976e minor performance improvements in other apps subdirectories 2014-04-27 23:25:02 +02:00
graffy76
985af15a12 removed qdebug references 2014-04-26 21:43:59 -05:00
graffy76
0d711e51b0 Converted SettingType enums to indicate widget type. 2014-04-26 21:32:36 -05:00
graffy76
b94466dbb4 Merge branch 'master' of https://github.com/OpenMW/openmw 
merge
 2014-04-26 21:24:02 -05:00
graffy76
ab33e78b67 Added RangeView class files 2014-04-26 09:40:58 -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
ce56669339 Fixed failed signal/slot connection between UserSettings and 
CSVWorld::SubView
 2014-04-23 17:02:37 -05: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
Marc Zinnschlag
65161c3e24 Merge remote-tracking branch 'sirherrbatka/less-signals' 2014-04-16 10:22:20 +02:00
Marc Zinnschlag
ce33912980 Merge remote-tracking branch 'sirherrbatka/AngryFix' 2014-04-16 10:21:59 +02:00
Marc Zinnschlag
a7cece3d30 do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit 2014-04-15 22:34:15 +02:00
Marek Kochanowicz
8fba71101c removed signals 2014-04-15 20:39:19 +02:00
Marek Kochanowicz
fc1837e2ed fixed bug: regions can be dragged 
ps
fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
 2014-04-15 19:26:43 +02:00
Marc Zinnschlag
d188e68227 added f-type hint to TableSubView 2014-04-13 16:40:41 +02:00
Marc Zinnschlag
097c063b8a added 'view in table' action to region map 2014-04-13 16:40:16 +02:00
Marc Zinnschlag
2eca9e72fd added view action to region map 2014-04-13 15:46:31 +02:00
Marc Zinnschlag
1892550833 added set/unset region actions to region map 2014-04-13 15:32:49 +02:00
Marc Zinnschlag
fc4195a88f added create cell menu item to regionmap 2014-04-13 14:17:18 +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
2f63eb7ca4 added missing edit lock for record reordering 2014-04-12 20:07:09 +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
e0550ba336 allow multiple cell coordinates in c-type hint for scene subviews 2014-04-07 15:23:14 +02:00
Marc Zinnschlag
0d352cb883 replaced rectangular cell selection with a CellSelection object 2014-04-07 14:16:02 +02:00
Marc Zinnschlag
67965ec10c added CellCoordinates and CellSelection classes 2014-04-07 13:44:43 +02:00
Marc Zinnschlag
324b2743d4 removed grid button (discarding the first attempt at a cell selector) 2014-04-07 10:21:26 +02:00
Marc Zinnschlag
0fe67b586a increased scene toolbar button size 2014-04-05 13:16:13 +02:00
Marc Zinnschlag
baf30ba292 added grid tool (does not work yet) 2014-04-03 14:44:48 +02:00
Marc Zinnschlag
3a58da9ad7 size adjustment 2014-04-03 13:30:22 +02:00
Marc Zinnschlag
5d422fec8a fixed scene toolbar layout problems 2014-04-03 13:00:19 +02:00
Marc Zinnschlag
5b5069535e keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly 2014-04-01 10:04:14 +02:00
Marc Zinnschlag
ce792cf182 Merge branch 'light' 2014-03-27 14:39:40 +01:00
Marc Zinnschlag
53c4878d52 fix for inconsistent case in topic records 2014-03-27 10:01:42 +01:00
Marc Zinnschlag
ed524b2fd4 added bright lighting mode 2014-03-26 18:29:15 +01:00
Marc Zinnschlag
9746f8bd32 added night lighting mode 2014-03-26 17:59:42 +01:00
Marc Zinnschlag
fa29942b27 added day lighting mode 2014-03-26 17:47:56 +01:00
Marc Zinnschlag
d5506172e8 added lighting switching 2014-03-23 15:14:26 +01:00
Marc Zinnschlag
205354ba30 some ambient light cleanup 2014-03-23 13:40:56 +01:00
Marc Zinnschlag
4d80bc009a Merge remote-tracking branch 'scrawl/master' 2014-03-22 09:54:42 +01:00
scrawl
0c207f7212 Fix build error 2014-03-22 02:08:09 +01:00
Alexander "Ace" Olofsson
317f1e0b63 Update dialoguesubview.cpp 
That doesn't work on Windows. (Are and/or allowed in C++ in any other compiler?)
 2014-03-21 13:44:01 +01:00
Marc Zinnschlag
41fd94b160 compensated for different coordinate systems 2014-03-21 13:39:22 +01:00
Marc Zinnschlag
1e57d55717 update/close on deletion of reference/referenceable 2014-03-21 13:27:46 +01:00
Marc Zinnschlag
698fe8cce3 update preview title on changed referenceableID (preview for references only) 2014-03-21 12:52:46 +01:00
Marc Zinnschlag
58daf52a67 deal with empty and invalid referenceable ID fields 2014-03-21 12:44:06 +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
10ce47938b update preview on reference/referenceable changes 2014-03-21 11:22:43 +01:00
Marc Zinnschlag
2128d3008c Merge branch 'master' into preview 2014-03-21 08:12:06 +01:00
Marek Kochanowicz
fbb619db73 … 2014-03-20 21:41:11 +01:00
Marek Kochanowicz
a692ce99fa where was my mind… 2014-03-20 20:26:53 +01:00
Marek Kochanowicz
ccd5e549cd moved buttons down 2014-03-20 19:53:03 +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
5c34823bb0 added some placeholder icons 2014-03-20 13:59:00 +01:00
Marek Kochanowicz
ad2f9a69a1 prevent deleting already deleted record 2014-03-20 08:59:04 +01:00
Marek Kochanowicz
ea9b6fa37e view button 2014-03-19 12:01:36 +01:00
Marek Kochanowicz
8f3103ce65 added preview button 2014-03-19 11:43:25 +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
010160d047 missed those :/ 2014-03-18 20:56:55 +01:00
Marek Kochanowicz
c0b2b783cb use more proper creators 2014-03-18 20:53:21 +01:00
Marek Kochanowicz
db774b02d7 clone and create buttons work 2014-03-18 09:36:22 +01:00
Marek Kochanowicz
95afca0558 delete record button 2014-03-17 19:28:41 +01:00
Marek Kochanowicz
7296b09357 revert button 2014-03-17 19:18:18 +01:00
Marek Kochanowicz
09ba547630 use tool buttons with icons 2014-03-17 15:35:36 +01:00
Marc Zinnschlag
20ea859aac adjusted the far clip distance 2014-03-16 17:14:44 +01:00
sirherrbatka
3c8eeb8c48 added comment 2014-03-16 17:11:13 +01:00
Marc Zinnschlag
6b11265fbc consider scale and orientation when previewing reference 2014-03-16 17:06:45 +01:00
Marc Zinnschlag
48ea93d890 less random camera start position 2014-03-16 17:06:30 +01:00
sirherrbatka
4a0d1ba272 do not cast and check multiple times 2014-03-16 17:06:11 +01:00
Marc Zinnschlag
fa042a8aca use proper title for reference prewview subviews (avoid internal ID) 2014-03-16 13:22:32 +01:00
Marc Zinnschlag
c36dfef972 prewview subview 2014-03-16 12:44:01 +01:00
Marek Kochanowicz
4a623ace71 disabling works 2014-03-13 18:41:37 +01:00
Marek Kochanowicz
c97172d89c fixed segfault and prevent drops from other documents 2014-03-13 17:00:14 +01:00
Marek Kochanowicz
e1a4b64efb fixed segfault 2014-03-13 16:50:04 +01:00
Marek Kochanowicz
dd755a00e4 fix for the bug (?) 2014-03-13 08:52:37 +01:00
Marek Kochanowicz
cc1ceb35ce drag and drop works 2014-03-12 20:34:55 +01:00
Marek Kochanowicz
fd4829141d succesfully connected the signals 2014-03-12 19:55:51 +01:00
Marek Kochanowicz
1bf67e7390 added the new qlineedit subclass 2014-03-12 19:36:46 +01:00
Marek Kochanowicz
30a0c82e22 this code segfaults, but i don't know why 2014-03-12 16:28:10 +01:00
Marek Kochanowicz
919065db32 fixed segfault 2014-03-12 16:06:59 +01:00
Marek Kochanowicz
d1290ac556 skip deleled or erased records 2014-03-12 15:46:27 +01:00
Marek Kochanowicz
2278eb5e91 handle locking 2014-03-12 15:17:49 +01:00
Marek Kochanowicz
1a9d4204d2 correction 2014-03-12 15:07:17 +01:00
Marek Kochanowicz
2e226e63b6 change universalid of base subview after pressing next or prev 2014-03-12 13:04:40 +01:00
Marek Kochanowicz
cb9bcc3cc1 buttons are functional 2014-03-12 12:25:37 +01:00
Marek Kochanowicz
299b7a6ce6 Added buttons, they don't do anything. 2014-03-12 11:08:04 +01:00
Marek Kochanowicz
8d50af547a created editwidget 2014-03-12 10:39:28 +01:00
Marek Kochanowicz
865e6b52ae scroll area 2014-03-11 21:21:05 +01:00
Marek Kochanowicz
c422dc6eed Refactorisation. 2014-03-11 20:40:31 +01:00
Marek Kochanowicz
5ad572346b referencables also work now 2014-03-11 13:02:25 +01:00
Marek Kochanowicz
1edf5a4414 registered additional subviews. 2014-03-11 10:47:30 +01:00
Marek Kochanowicz
87286232d7 fixed bug, god bless overloading 2014-03-11 09:38:53 +01:00
Marek Kochanowicz
a25271f0b6 moving bloat away from the dispatcher 2014-03-11 09:14:13 +01:00
Marc Zinnschlag
ef1364878f moved test cube from SceneWidget to WorldspaceWidget 2014-03-10 18:35:49 +01:00
Marek Kochanowicz
17b521cec8 additional check 2014-03-10 17:57:40 +01:00
Marek Kochanowicz
f4614c2c63 use qlabels for not editable fields 2014-03-10 17:52:45 +01:00
Marek Kochanowicz
089732419a introduce longString 2014-03-10 17:18:29 +01:00
Marek Kochanowicz
cc96a38921 use qlinedit for the var 2014-03-10 13:27:52 +01:00
Marek Kochanowicz
874847c959 handle color 2014-03-10 13:25:01 +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
73cb3ac0ed embelishing 2014-03-10 12:04:03 +01:00
Marek Kochanowicz
361bc55973 dont force trying display 2014-03-10 09:47:41 +01:00
Marek Kochanowicz
9ab920bd80 display id and other not editable data 2014-03-10 09:37:53 +01:00
Marek Kochanowicz
b2fdaa74b0 trying to set the size policy 2014-03-09 18:44:04 +01:00
Marc Zinnschlag
2b17f5dde9 register resources locations on editor startup 2014-03-09 12:32:21 +01:00
Marek Kochanowicz
7eb10756d4 some extra views enabled 2014-03-09 08:58:24 +01:00
Marek Kochanowicz
0447be7e7a register extra views. do not display id 2014-03-08 17:24:00 +01:00
Marek Kochanowicz
1f1774b5e1 changing the enumdelegate seteditordata 2014-03-08 16:54:05 +01:00
Marek Kochanowicz
9612c6a6fd handle also bool boxes 2014-03-08 16:50:42 +01:00
Marek Kochanowicz
08ccae6b49 handle comboboxes 2014-03-08 16:21:49 +01:00
Marek Kochanowicz
a8b11829d4 disable not editable widgets 2014-03-08 15:18:40 +01:00
Marek Kochanowicz
3c60345d6b nest wrapper into the proxy class 2014-03-08 15:15:00 +01:00
Marek Kochanowicz
2e6b45dafb edit view, savind works 2014-03-07 22:17:40 +01:00
Marek Kochanowicz
020e3f8fc5 Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3 2014-03-07 17:16:38 +01:00
Marek Kochanowicz
f0a45fa15f just saved progress 2014-03-07 17:15:43 +01:00
Marek Kochanowicz
b0ae78e889 basicly enabled code 2014-03-06 20:10:13 +01:00
Marc Zinnschlag
f1353dc84f Merge branch 'scene' 2014-03-06 16:46:44 +01:00
Marc Zinnschlag
516a3b9abd close interior cell view when cell is deleted 2014-03-06 16:40:08 +01:00
Marc Zinnschlag
0254a209f6 some general cleanup 2014-03-06 13:51:21 +01:00
Marc Zinnschlag
f04348fb8e do not offer view action for cells flagged as deleted 2014-03-06 13:43:06 +01:00
Marc Zinnschlag
4a119c8f46 ambient lighting in interior cells 2014-03-06 13:02:21 +01:00
Marc Zinnschlag
7e0f0c8402 fixed SceneWidget destructor 2014-03-06 12:42:09 +01:00
Marc Zinnschlag
397921e457 specialising WorldspaceWdiget into paged and unpaged subclasses 2014-03-06 10:13:39 +01:00
Marc Zinnschlag
7386d3eb0b moved navigation into the WorldspaceWidget 2014-03-06 10:01:23 +01:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
Marc Zinnschlag
a264e86e13 subclasses scene widget for worldspace scenes 2014-03-04 14:47:43 +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
55195f819a changed edit requests from row index format to UniversalId/hint format 2014-03-02 22:34:41 +01:00
Marc Zinnschlag
797f5527ee added hint parameter for UniversalId viewing requests 2014-03-02 13:29:02 +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
Marc Zinnschlag
536a0e0ab0 added orbit navigation mode 2014-03-01 14:15:04 +01:00
Marc Zinnschlag
4d3abeedcb keep camera upright in 1st person mode 2014-02-28 13:37:01 +01:00
Marc Zinnschlag
ae637d6abc rolling 2014-02-28 11:58:03 +01:00
Marc Zinnschlag
4eea2c7a86 added free navigation mode 2014-02-27 15:42:59 +01:00
Marc Zinnschlag
c977b2a756 moved implementation of the 1st person camera into a separate file 2014-02-27 15:23:14 +01:00
Marc Zinnschlag
14c3bfcf62 added navigation class 2014-02-27 14:46:06 +01:00
Marc Zinnschlag
8f73cc9268 added navigation mode selection 2014-02-25 14:59:46 +01:00
Marc Zinnschlag
526d75df51 inverted ctrl key 2014-02-25 14:30:38 +01:00
Marc Zinnschlag
644f5cb8de fixed mouse button release detection 2014-02-25 14:28:55 +01:00
Marc Zinnschlag
e33bd4d508 camera rotation via ctrl-left button drag 2014-02-25 14:24:35 +01:00
Marc Zinnschlag
e987199949 getting rid of some magic numbers 2014-02-25 14:14:53 +01:00
Marc Zinnschlag
07d20a2013 camera panning via left button drag 2014-02-25 14:09:07 +01:00
Marc Zinnschlag
b9107addc0 mouse wheel zooming 2014-02-25 13:39:49 +01:00
Marc Zinnschlag
b6ae521aa5 moving the camera with A and D keys 2014-02-25 13:31:15 +01:00
Marc Zinnschlag
af50575259 use shift key to speed up camera movement 2014-02-25 13:17:15 +01:00
Marc Zinnschlag
8081c067a6 moving the camera with W and S keys 2014-02-25 13:09:37 +01:00
Marc Zinnschlag
4ec4599be3 added navigation mode enum to SceneWidget 2014-02-25 12:30:45 +01:00
Marc Zinnschlag
6ec86564d1 re-enabled OGRE in OpenCS; cleaned up startup 2014-02-25 11:58:32 +01:00
Nikolay Kasyanov
59508e914f Fixed OpenCS build on OS X 2014-02-22 01:17:58 +04:00
Marek Kochanowicz
e348c6baa9 accept drops from filters table. Cool. ☺ 2014-02-21 13:50:59 +01:00
Marek Kochanowicz
e2dce53543 additional check on droping to prevent exception 2014-02-21 12:55:01 +01:00
Marek Kochanowicz
fcf17805a0 Installing basic event filter 2014-02-21 12:48:39 +01:00
Marek Kochanowicz
55e9083570 refactorisation 2014-02-21 10:27:23 +01:00
Marek Kochanowicz
1c35a85adf fixed bugs, added extra display_type 2014-02-20 19:27:51 +01:00
Marek Kochanowicz
7dff34ebf1 Features implemented. Time to debug. 2014-02-20 19:15:09 +01:00
Marek Kochanowicz
3ad6df1f92 try with the passing action 2014-02-20 17:54:18 +01:00
Marek Kochanowicz
38a86b5015 We can handle droping multiple records 2014-02-20 16:01:54 +01:00
Marek Kochanowicz
b788ab8b4c correcting 2014-02-20 14:10:03 +01:00
Marek Kochanowicz
4fe21dc38f Const correctness 2014-02-20 12:43:09 +01:00
Marek Kochanowicz
eb3cbaa4e1 Create filter on droping record. 2014-02-20 12:25:47 +01:00
Marek Kochanowicz
c7b3e139aa Propagate signal to the edit widget 2014-02-20 11:07:04 +01:00
Marek Kochanowicz
fca7701359 Column titles retrived and passed to the filterbox. 2014-02-19 16:15:51 +01:00
Marek Kochanowicz
d7a1abb30b emit signal with types (will be connected to the tablesubview) 2014-02-19 12:55:39 +01:00
Marek Kochanowicz
dd95ed8e4c Accept drops on the filterbox 2014-02-19 12:32:48 +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
Marek Kochanowicz
2bb9e47507 Improvements. 2014-02-17 08:58:55 +01:00
Marek Kochanowicz
e1a0f60041 allow _foo ids without qoute 2014-02-16 20:26:22 +01:00
Marek Kochanowicz
b83817e05e May only include alphanumeric characters and underscores and may not start with a number. 2014-02-16 20:18:28 +01:00
Marek Kochanowicz
3cc23a9cb3 very basic, but safe putting down " " 2014-02-16 18:41:42 +01:00
Nikolay Kasyanov
4e28fd85a3 Fixed build on OS X 2014-02-16 20:22:46 +04:00
Marc Zinnschlag
6ac64bbe15 Merge branch 'script' 
Conflicts:
	readme.txt
 2014-02-16 12:12:56 +01:00
Marek Kochanowicz
17af865a9f checking for the source of the drop, reject those from other files for now 2014-02-16 09:51:33 +01:00
Marek Kochanowicz
cbe1fe2f95 removed misplaced bracket 2014-02-15 22:38:59 +01:00
Marek Kochanowicz
45d9364195 Put the id in the quote. 2014-02-15 22:14:27 +01:00
Marek Kochanowicz
ec8c8a9d88 -journalinfo +topic 2014-02-15 22:05:42 +01:00
Marek Kochanowicz
41606a67e4 implemented whitelist of allowed types in the scripts 2014-02-15 20:49:09 +01:00
Marek Kochanowicz
930b77e60a allow drag and drop into the script edit window. 2014-02-15 19:52:40 +01:00
Marek Kochanowicz
97fe5465bf created new files 2014-02-15 17:55:18 +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
Marek Kochanowicz
4ee90c24e5 more readable code. 2014-02-15 13:22:14 +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
d6820b977e store const ref to the document in the table. 2014-02-15 12:22:32 +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
Marek Kochanowicz
ae418f2538 nicer formatting 2014-02-14 12:51:50 +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
Marc Zinnschlag
053b3dc371 Merge branch 'openmw-28' 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:57:28 +01:00
Marek Kochanowicz
40cc108e54 drag and drop works. 2014-02-13 20:19:51 +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
gus
6cf561f713 get index to where we are dropping 2014-02-12 11:32:01 +01:00
gus
2e33ab3a13 droping somewhat works 2014-02-12 11:16:12 +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
Marek Kochanowicz
53e2e8415d replaced start with exec 2014-02-11 12:25:21 +01:00
gus
df46218acc try droping 2014-02-10 16:48:04 +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
3b8f04c0f3 Allow multi-item drag. 2014-02-05 11:44:08 +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
8b799683c1 Display QPixMap with dragged object. 2014-02-04 18:48:18 +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
d3000ce099 whitespaces removed again. 2014-01-27 19:47:54 +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
ed0ba906cf removed needless include 2014-01-27 15:05:29 +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
71d6364754 Chaninging variables name to follow our policy. 2014-01-27 13:13:39 +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
Marek Kochanowicz
032c542396 improving the cell cloning. 2014-01-24 20:34:33 +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
scrawl
786ed6ca5b Include some required Ogre headers explicitely 2014-01-24 15:02:34 +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
f390c7f4b0 Disable widgets in the cell creator. 2014-01-23 16:24:03 +01:00
Marek Kochanowicz
c87d9ff38d Disable reference creator widget when in the clone mode. 2014-01-23 16:17:04 +01:00
Marek Kochanowicz
dda7ddb6f8 Disable not needed referencable creator widget when in cloning mode. 2014-01-23 16:00:44 +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
7594bcf97a Small refactoring. 2014-01-21 08:27:29 +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
d82f272e05 Properly check if clone is deleted. 2014-01-20 16:17:49 +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
Marek Kochanowicz
b3e45c55bc progressing with the cloning 2014-01-19 11:44:47 +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
Marek Kochanowicz
344cae8f99 added new entry to the context menu 2014-01-14 15:44:04 +01:00
Marek Kochanowicz
6397d9d40e Added mCloneAction member 2014-01-14 13:12:15 +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
scrawl
aa855e9524 Include some required Ogre headers explicitely 2014-01-09 20:56:24 +01:00
Marc Zinnschlag
7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 2014-01-08 20:16:39 +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
Marc Zinnschlag
b19b277f18 temporarily disable OGRE-integration in OpenCS (need to sort out path problem first) 2014-01-01 15:16:51 +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
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05: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
a3ff9e5be8 Change destruction order - fixes a shutdown crash discovered with mesa 2013-12-26 20:53:52 +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
Nikolay Kasyanov
9fabae5198 OS X: force Cocoa API for Ogre windows in OpenCS 2013-12-25 00:26:15 +04: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
2fe135d85f journals subview was bound to the wrong universal ID type 2013-12-02 16:25:26 +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
Sebastian Wick
4a816b6c17 fix context menu 2013-11-16 23:08:03 +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
a44fad4c59 disabled revert for info tables (no easy way to make this work) 2013-11-14 11:55:02 +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
Nikolay Kasyanov
05e19b37e3 Removed obsolete comment 2013-11-10 22:25:29 +04:00
Nikolay Kasyanov
dafe80874a Added empty line 2013-11-10 22:24:31 +04:00
Nikolay Kasyanov
96714fc2c1 OpenCS: proper working dir & library path on OS X 2013-11-10 22:19:32 +04:00
Nikolay Kasyanov
fa13818360 OS X: OpenCS packaging 2013-11-10 22:04:13 +04:00
Nikolay Kasyanov
0494fa543f OpenCS: set current directory to bundle location on OS X, like in OpenMW binary 2013-11-10 20:39:35 +04:00
Nikolay Kasyanov
df5b52b45b OpenCS.app icon & bundle properties 2013-11-10 20:11:53 +04:00
Nikolay Kasyanov
04edd25add OpenCS as a separate app bundle 2013-11-10 19:09:05 +04: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
b7bb7d6902 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/opencs/editor.cpp
 2013-11-10 11:49:48 +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
a06aa881cb make sure case handling in info IDs is consistent 2013-11-08 12:03:03 +01:00
Marc Zinnschlag
982024a328 Topic range access in InfoCollection 2013-11-08 11:52:30 +01:00
Marc Zinnschlag
0745a86039 added InfoCreator 2013-11-08 11:51:59 +01:00
Bret Curtis
5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-08 09:08:56 +01:00
Bret Curtis
36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-07 23:05:45 +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
graffy76
dace904490 changed game/addon to content for writing to openmw.cfg from launcher 2013-11-03 16:45:18 -06:00
graffy76
12c06a5615 Fixed broken dependency check 2013-11-03 06:21:28 -06:00
Marc Zinnschlag
4724df7e9b added topic/journal column to info tables 2013-11-03 10:48:50 +01:00
graffy76
973803eb2f Fixed pathing issues in launcher 2013-11-03 00:02:46 -05:00
graffy76
cddece4f9e Another stab at fixing the pathing problem... 2013-11-01 21:47:26 -05:00
scrawl
e6960d915a Add simple Ogre widget 2013-11-02 02:51:38 +01:00
Marc Zinnschlag
15b7d3263c subclass ESM::DialInfo to keep track of parent topic 2013-11-01 17:43:45 +01:00
graffy76
0cb591e4f6 Fixed path problem with adjuster widget and local data path. 2013-10-31 18:12:13 -05:00
Marc Zinnschlag
ea0e8be0d3 disallow sorting (via column headers) in info tables 2013-10-31 13:40:14 +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
graffy76
b51bef0d98 fixed missing adjuster widget in file dialog open view 2013-10-27 20:21:19 -05: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
ea7a8eb2a4 last commit 2013-10-26 23:04:39 -05:00
graffy76
5e123d3f52 Hide adjusterwidget for open files view 2013-10-26 22:57:22 -05:00
graffy76
9b483c3ae3 Fix for file path issues 2013-10-26 22:55:44 -05:00
graffy76
ba365ff49e Fixed merge conflicts with saving branch 2013-10-25 19:23:03 -05:00
graffy76
9ce4a04a2d merge from saving 
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
 2013-10-25 14:44:22 -05:00
graffy76
16d87ea1d1 Merge branch 'master' into esxSelector 2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731 Fixed filedialog new / edit content path issue 2013-10-24 17:33:28 -05:00
graffy76
b48f066f33 Reimplemented content selector for filedialog and datafilespage classes 2013-10-23 17:39:17 -05:00
graffy76
ba3589bc76 Revert "Implemented ContentSelector as a singleton "charm" modifier for" 
This reverts commit 24b167b755.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
 2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6 Reimplemented constentselector view class 2013-10-22 21:52:35 -05:00
Marc Zinnschlag
67bc0a0c70 additional modification to the IDValidator (restricting relaxed mode slightly more) 2013-10-22 11:32:10 +02: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
aa61948801 relaxed rules for new IDs when ID is also a user visible text 2013-10-22 11:08:37 +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
88e09159c4 splitting off characters menu from mechanics menu (was getting too big) 2013-10-21 18:04:40 +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
Marek Kochanowicz
b23df42817 Removed old comment. Changed to set resources path correctly. 2013-10-21 16:06:16 +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
c0e5501431 disallow the deletion of non-topic, non-journal dialogue records 2013-10-21 13:58:47 +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
4e26a61db3 Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path. 2013-10-18 22:11:14 +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
Marek Kochanowicz
3000386443 failed attempt on switch adding. 2013-10-16 13:07:26 +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
4624bed899 changed handling of scene toolbar button icons 2013-10-13 15:41:48 +02:00
Marc Zinnschlag
608d154ad7 Merge remote-tracking branch 'rainChu/master' 2013-10-12 20:31:33 +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
graffy76
17950210fa Merge branch 'master' into esxSelector 2013-10-07 06:52:20 -05:00
Marc Zinnschlag
74cee66273 consolidated magic numbers for button size 2013-10-07 11:24:53 +02:00
Marc Zinnschlag
4d6c3cdf09 removed more garbage 2013-10-07 08:55:04 +02:00
graffy76
4c72a9ffdf Fixed non-loading files 2013-10-06 22:10:38 -05:00
graffy76
217a4d75b4 Implemented profile function in launcher datafiles page 
Implemented dependency sorting to ensure dependent files appear latest
in the list.
 2013-10-06 21:13:47 -05:00
graffy76
00c78a4aa1 Implementing ContentSelector class in DataFilesPage 
Moved AdjusterWidget / FileWidget to ContentSelectorView
 2013-10-01 21:29:45 -05:00
Alex "rainChu" Haddad
4496244b14 Tabs to spaces 
My own code uses only tabs - I forgot to change the setting on my IDE,
sorry!
 2013-10-01 05:36:13 -04:00
Alex "rainChu" Haddad
bffbfff41c My own fix to make it hackily compile 2013-09-30 00:32:06 -04:00
graffy76
24b167b755 Implemented ContentSelector as a singleton "charm" modifier for 
FileDialog...
 2013-09-29 12:19:07 -05:00
Marc Zinnschlag
7be1f1afc2 implemented SceneToolMode as a horizontal panel with radiobutton-type buttons 2013-09-28 13:10:42 +02:00
Marc Zinnschlag
0c5f07a65a added SceneToolMode class 2013-09-28 11:27:24 +02:00
Marc Zinnschlag
84cadc10f4 added scene toolbar buttons (still not doing anything) 2013-09-28 11:06:56 +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
31346dde58 fixed uninitialise scope value for filters 2013-09-27 13:55:28 +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
graffy76
3b40192e90 Merge branch 'master' into esxSelector 2013-09-23 22:03:42 -05:00
Marek Kochanowicz
ae5e8b95ff Solving Issue912 2013-09-23 20:12:04 +02:00
graffy76
d7cff6361e Fixed filter issue (all addons for a gamefile are enabled for checking). 
Note:  Other dependencies are not yet automatically selected when an
addon is checked.
 2013-09-23 06:51:49 -05:00
Marc Zinnschlag
6d9ff39390 set dependencies when saving (requires further refinements) 2013-09-23 12:16:56 +02:00
Marc Zinnschlag
74d683b530 fixed save path for newly created addons 2013-09-23 11:58:11 +02:00
Marc Zinnschlag
63e0cf5154 fixed missing initialisation of adjuster widget in file dialogue 2013-09-23 11:26:29 +02:00
Marc Zinnschlag
d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e Implemented file/adjuster widgets into new addon creation dialog 2013-09-22 23:52:53 -05:00
Marc Zinnschlag
a6ea670255 use IdTypeDelegate in report table 2013-09-22 13:54:01 +02:00
Marc Zinnschlag
1c4a4b4f26 generalised RefIdTypeDelegate into IdTypeDelegate 2013-09-22 13:39:44 +02:00
Marc Zinnschlag
f2875e234c added missing position columns to reference table 2013-09-22 10:43:09 +02:00
graffy76
70ac14b8ba Merge branch 'master' into esxSelector 2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d Merge branch 'master' into esxSelector 2013-09-19 16:24:28 -05:00
Marc Zinnschlag
8d4f4e395f update syntax highlighting when ID list changes 2013-09-19 14:26: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
78f7f80fc3 configured script highlighting with extensions 2013-09-19 08:58: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
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