mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 12:53:51 +00:00
Code Issues Releases Wiki Activity
10504 commits 38 branches 54 tags 122 MiB
Commit graph

1034 commits

Author SHA1 Message Date
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
a30d816982 fixed a mixup in CSMTools::Tools constructor/destructor 2014-05-06 11:44:20 +02:00
Marc Zinnschlag
492620c8cf handle exceptions thrown during loading and report them to the user 2014-05-06 09:39:39 +02:00
graffy76
5cba828cc9 Removed unneeded code from setting manager. Moved some code to user 
settings
 2014-05-05 06:26:00 -05:00
graffy76
74fa115d20 fixed check for missing ini files 2014-05-05 06:07:41 -05: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
3f737bbb44 implemented QDial into RangeView class 2014-05-03 22:02:16 -05:00
graffy76
4f876574c1 Implemented slider widget in rangeView class 2014-05-03 21:50:08 -05:00
graffy76
0a3ab3dcd1 Commented out "proxy selection test" demo page in user settings 2014-05-03 19:48:04 -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
6692d2dc72 split up load function in a start and continue part 2014-05-03 15:05:02 +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
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