teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
11983 commits 34 branches 0 tags 66 MiB
Commit graph

870 commits

Author SHA1 Message Date
Marc Zinnschlag
0c1ad54e68 refactored object rendering into a separate class 2014-06-27 09:12:26 +02:00
scrawl
e19bbfd1b5 Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text (Fixes #1543) 2014-06-26 20:49:22 +02:00
Marc Zinnschlag
bd252d0aec display record count in loading window 2014-06-26 11:41:21 +02:00
slothlife
9ea22324f7 Fix some MSVC warnings. 
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
 2014-06-23 01:13:30 -05:00
scrawl
fd59a4a79e Fix some doxygen typos 2014-06-15 16:11:22 +02:00
Marc Zinnschlag
7d1ecea20c added extended versions of revert and delete 2014-06-11 11:43:38 +02:00
Marc Zinnschlag
48468b7d0c some dialogue subview cleanup and start of command dispatching refactoring 2014-06-08 14:10:08 +02:00
Marc Zinnschlag
7ede6573eb removed more hardcoded column numbers 2014-06-07 14:39:34 +02:00
Marc Zinnschlag
302e2f8e9a fixed some proxy model problems related to column numbers 2014-06-07 14:32:12 +02:00
Marc Zinnschlag
85fca19fd9 replaced selection model in CommandDispatcher with a slightly slower but more robust implementation 2014-06-07 13:02:45 +02:00
Marc Zinnschlag
3e0c6ec732 some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have 2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb factored out command creation from table view into a separate class 2014-06-06 12:43:21 +02:00
Marc Zinnschlag
a28a2bc2fe simplified feature management for record tables 2014-06-05 10:28:10 +02:00
Marc Zinnschlag
7c149e98e0 Merge branch 'openmw-30' 2014-05-18 22:38:52 +02:00
cc9cii
8971db8962 SceneWidget windowHandle fix for Windows. 2014-05-17 23:53:33 +10:00
Marc Zinnschlag
d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup' 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
 2014-05-15 08:13:15 +02:00
slothlife
f33559fead Fixes for MSVC warnings, less overall changes 
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
 2014-05-14 20:12:52 -05:00
Marc Zinnschlag
c2ea92b93a Merge remote-tracking branch 'sirherrbatka/Feature#1274' 2014-05-14 14:41:04 +02:00
Marek Kochanowicz
3439900239 ignore all drops that will not create usefull filter 2014-05-14 11:56:23 +02:00
slothlife
c160a04ede Revert "Fixes for warnings when building with MSVC" 
This reverts commit 46eb20b98c.
 2014-05-14 00:03:30 -05:00
Marc Zinnschlag
804bf523ba removed two unused files 2014-05-10 17:35:11 +02:00
Marc Zinnschlag
79d59153c1 improved layout of loading window 2014-05-10 13:29:28 +02:00
Marc Zinnschlag
95d24492de display load error messages in loading window 2014-05-10 13:18:40 +02:00
Marc Zinnschlag
aadaf7827d added load error log 2014-05-10 12:04:36 +02:00
slothlife
46eb20b98c Fixes for warnings when building with MSVC 
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
 2014-05-09 08:32:52 -05:00
Marc Zinnschlag
6eff5ecaad Merge branch 'operations' into load 
Conflicts:
	apps/opencs/main.cpp
	apps/opencs/model/doc/document.cpp
 2014-05-08 13:17:24 +02:00
graffy76
0e7d40de6a Merge branch 'master' of https://github.com/OpenMW/openmw 
upstream merge
 2014-05-07 22:00:08 -05:00
graffy76
cd7983adb5 Decoupled setting definitions from the Setting class. QSettings 
implementation is now fully responsible for managing user settings.
 2014-05-07 21:59:26 -05:00
Marc Zinnschlag
21142711f0 Merge remote-tracking branch 'graffy76/master' 2014-05-07 10:35:11 +02:00
graffy76
e47e3de3d2 Removed unneeded includes, cleaned up code, added comments 2014-05-06 21:58:50 -05:00
graffy76
8fb96e1be3 Removed error code for missing opencs.ini files. 2014-05-06 19:22:45 -05:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
Marc Zinnschlag
492620c8cf handle exceptions thrown during loading and report them to the user 2014-05-06 09:39:39 +02:00
graffy76
475214ab62 Implmented QSettings for loading / saving file definitions. Also 
renamed opencs.cfg to opencs.ini to follow Ini format standards
 2014-05-05 05:56:03 -05:00
Marc Zinnschlag
df97a1b57f Merge remote-tracking branch 'sirherrbatka/Feature#1274' 2014-05-04 17:11:43 +02:00
Marek Kochanowicz
f51f826dad fixed compilation 2014-05-04 15:13:03 +02:00
Marc Zinnschlag
7f78c29bb5 Merge remote-tracking branch 'sirherrbatka/Feature#1274' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2014-05-04 14:03:56 +02:00
Marek Kochanowicz
4a502226e6 added flag to distingiush widgets 2014-05-04 12:41:06 +02:00
graffy76
4f876574c1 Implemented slider widget in rangeView class 2014-05-03 21:50:08 -05:00
graffy76
35d1502308 Merge branch 'master' of https://github.com/OpenMW/openmw 
merge
 2014-05-03 19:16:42 -05:00
graffy76
1c26741c56 Implemented rangeview with spinbox as only control. Simplified setting 
class constructor.
 2014-05-03 18:58:43 -05:00
graffy76
bc6197c552 Added custom spin box class 2014-05-03 18:57:34 -05:00
Marek Kochanowicz
00b21449a2 replaced type_cell with type_scene 2014-05-03 19:47:13 +02:00
Marc Zinnschlag
e9c2f24faa intercept close button clicks in loading window 2014-05-03 17:14:17 +02:00
Marc Zinnschlag
3fdd72f204 added cancel button to loading window 2014-05-03 16:44:50 +02:00
Marc Zinnschlag
6bc5869222 record loading progress bar 2014-05-03 15:33:35 +02:00
Marc Zinnschlag
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
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
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
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
ab33e78b67 Added RangeView class files 2014-04-26 09:40:58 -05: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
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
65161c3e24 Merge remote-tracking branch 'sirherrbatka/less-signals' 2014-04-16 10:22:20 +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
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
2f63eb7ca4 added missing edit lock for record reordering 2014-04-12 20:07:09 +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
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
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
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
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
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
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
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
Marek Kochanowicz
4ee90c24e5 more readable code. 2014-02-15 13:22:14 +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
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
Marek Kochanowicz
ae418f2538 nicer formatting 2014-02-14 12:51:50 +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
2afe3f3e57 Introduced multitype icon. 2014-02-13 19:00:35 +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
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
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
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
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
8b799683c1 Display QPixMap with dragged object. 2014-02-04 18:48:18 +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
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
ed0ba906cf removed needless include 2014-01-27 15:05:29 +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
032c542396 improving the cell cloning. 2014-01-24 20:34:33 +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
4d9d31b25e refrences cloning does not work 2014-01-23 09:41:09 +01:00
Marek Kochanowicz
bc0130f8d8 do not double check if record is deleted 2014-01-21 10:35:08 +01:00
Marek Kochanowicz
7594bcf97a Small refactoring. 2014-01-21 08:27:29 +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
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
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
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
Marc Zinnschlag
b19b277f18 temporarily disable OGRE-integration in OpenCS (need to sort out path problem first) 2014-01-01 15:16:51 +01:00
Nikolay Kasyanov
9fabae5198 OS X: force Cocoa API for Ogre windows in OpenCS 2013-12-25 00:26:15 +04:00
Marc Zinnschlag
2fe135d85f journals subview was bound to the wrong universal ID type 2013-12-02 16:25:26 +01:00
Sebastian Wick
4a816b6c17 fix context menu 2013-11-16 23:08:03 +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
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
b7bb7d6902 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/opencs/editor.cpp
 2013-11-10 11:49:48 +01:00
Marc Zinnschlag
a06aa881cb make sure case handling in info IDs is consistent 2013-11-08 12:03:03 +01:00
Marc Zinnschlag
0745a86039 added InfoCreator 2013-11-08 11:51:59 +01:00
Marc Zinnschlag
9d7695ea88 added missing columns to topic info table 2013-11-05 11:41:48 +01:00
graffy76
12c06a5615 Fixed broken dependency check 2013-11-03 06:21:28 -06: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
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
767cb54e7c added missing columns to journal info table 2013-10-31 12:54:55 +01:00
Marc Zinnschlag
ba88c94d58 first attempt at an info record collection 2013-10-29 13:18:22 +01:00
graffy76
b51bef0d98 fixed missing adjuster widget in file dialog open view 2013-10-27 20:21:19 -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
aa61948801 relaxed rules for new IDs when ID is also a user visible text 2013-10-22 11:08:37 +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
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
Marc Zinnschlag
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
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
74cee66273 consolidated magic numbers for button size 2013-10-07 11:24:53 +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
31346dde58 fixed uninitialise scope value for filters 2013-09-27 13:55:28 +02:00
graffy76
3b40192e90 Merge branch 'master' into esxSelector 2013-09-23 22:03:42 -05: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
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
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
9c751ae370 separate highlight colour for IDs 2013-09-19 12:30:42 +02:00
Marc Zinnschlag
78f7f80fc3 configured script highlighting with extensions 2013-09-19 08:58:27 +02:00