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

1072 commits

Author SHA1 Message Date
Marc Zinnschlag
c85735abed Merge remote-tracking branch 'scrawl/terrain' 2014-10-09 12:56:42 +02:00
cc9cii
13f028e27b Avoid out of range exceptions. 2014-10-09 07:01:18 +11:00
cc9cii
b3ef7a71e2 Different implementation of update overlay fix. 2014-10-09 05:56:44 +11:00
scrawl
8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 2014-10-08 17:17:31 +02:00
cc9cii
5d8022bdc5 Update overlay upon control elements button signal. 2014-10-08 21:22:12 +11:00
cc9cii
e2560de05a Don't use windows path separator. 2014-10-08 08:08:03 +11:00
cc9cii
e1197e75bc Handle change of names or regions to dynamically update the overlay. 2014-10-08 07:54:22 +11:00
cc9cii
7836ee9ab6 Fixed crash exiting internal cells. Better starting camera position for external cells. 2014-10-07 21:18:32 +11:00
cc9cii
0cccdfd114 Added description below the cell id (name if exists, or region) 2014-10-07 19:35:28 +11:00
cc9cii
7640875f9d More cleanup. 2014-10-07 10:34:30 +11:00
cc9cii
f48f841d31 Add full path for Ogre Overlay headers (workaround for osx). 2014-10-07 06:40:28 +11:00
cc9cii
0197f7088f Remove extra frame rendering after enabling/disabling the label. 2014-10-07 06:04:13 +11:00
cc9cii
b3e09cce00 Remove mouse picking code. 2014-10-06 22:29:45 +11:00
cc9cii
972c789060 Add Ogre Overlay path to cmake. 2014-10-06 20:25:09 +11:00
cc9cii
cc6153eb8e Removed temporary key bindings. 2014-10-06 14:21:44 +11:00
cc9cii
6d687993b8 Remove C++11 stuff. 2014-10-06 14:08:35 +11:00
cc9cii
e38417e662 Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide. 
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag.  No idea what is causing this.
 2014-10-06 13:55:36 +11:00
cc9cii
dbb2781817 Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default. 2014-10-06 08:20:09 +11:00
cc9cii
85d93807c5 Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented. 2014-10-05 19:25:37 +11:00
cc9cii
c9e054cdd7 Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9.
 2014-10-04 06:20:10 +10:00
Marc Zinnschlag
9fd82212b3 Merge remote-tracking branch 'cc9cii/opencs-settings' 2014-10-03 13:11:05 +02:00
cc9cii
115841d31d Do not save window size on exit. 2014-10-03 05:59:24 +10:00
Marc Zinnschlag
f4c9897bbd Merge branch 'master' into tables 2014-10-02 15:49:36 +02:00
Marc Zinnschlag
00073694c6 added pathgrid subview 2014-10-02 15:16:19 +02:00
cc9cii
517a797a3e Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux. 2014-10-02 07:00:15 +10:00
cc9cii
5ffb740120 Fix silly mistake (thanks scrawl for picking that up) 2014-10-01 07:19:15 +10:00
cc9cii
a9745cce1e Suppress some compiler warnings. 2014-09-30 21:02:31 +10:00
Marc Zinnschlag
ff530a2e19 added missing magic effect table columns 2014-09-30 12:33:48 +02:00
cc9cii
dee090355f Changes to compile on Ubuntu 14.04. 2014-09-30 19:23:19 +10:00
cc9cii
687b62dfd3 Revert some changes (mostly iostream adds) 2014-09-30 18:46:26 +10:00
cc9cii
312b7cd571 Merge branch 'master' into QtOGre 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
 2014-09-30 10:52:04 +10:00
cc9cii
7675df60ba Fix far clip distance (again), workaround for broken settings minimum value. 2014-09-29 08:17:51 +10:00
cc9cii
54c77cf875 Silence clang warnings. 2014-09-29 06:39:44 +10:00
cc9cii
f0c739b763 Apply camera setting changes immediately. Remove current value check for shader setting changes. 2014-09-29 06:27:54 +10:00
cc9cii
6e8977348a Check the FSAA setting of windows rather than system value. 2014-09-28 19:43:26 +10:00
cc9cii
303b0ee8c6 Update scenewidget when antialiasing settings change. 2014-09-28 15:43:33 +10:00
cc9cii
8a0ff17c22 Update SceneWidget when relevant user settings change. 2014-09-28 14:08:14 +10:00
cc9cii
a25cffc242 Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights. 2014-09-28 10:17:54 +10:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
Marc Zinnschlag
23fd314294 added magic effects table 2014-09-26 13:12:17 +02:00
Marc Zinnschlag
33cd04b37d added missing sound gen table columns 2014-09-25 11:40:45 +02:00
cc9cii
127f9bb30d Fix reverting to wrong version. 2014-09-25 09:16:10 +10:00
cc9cii
61bab6b1f1 Sanitised version. Some settings are only accessible via manually editing the config file. 2014-09-25 08:15:07 +10:00
cc9cii
31fb160376 More cleanup. 2014-09-25 06:59:04 +10:00
cc9cii
66852d5392 Code cleanup and revert incorrect settings. 2014-09-24 22:41:49 +10:00
cc9cii
fdf375fb4d Reusing subviews implemented. 2014-09-24 13:49:19 +10:00
cc9cii
3f9b73812b Minor fixes and workarounds. 2014-09-24 11:55:22 +10:00
cc9cii
970f3609c9 Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments. 2014-09-24 09:33:19 +10:00
cc9cii
67503c93b2 Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed. 2014-09-23 22:33:49 +10:00
Marc Zinnschlag
7ab4881661 added sound gen table 2014-09-23 13:21:54 +02:00
cc9cii
d41230a0c5 Tweak the look of the recordfilterbox. Keep titlebar if floating. 2014-09-23 20:51:14 +10:00
cc9cii
ffae816aab Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar. 2014-09-23 17:01:08 +10:00
cc9cii
62406d5322 Use reasonable values for the spinbox. 2014-09-23 07:28:55 +10:00
cc9cii
437fb774c5 Re-implemented subview minimum size setting. 2014-09-23 07:16:07 +10:00
cc9cii
c8ae8f4a6d Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings. 2014-09-23 06:30:41 +10:00
cc9cii
c4f11785ec Added a window size change easter egg. 2014-09-22 21:12:26 +10:00
cc9cii
48f96df29d Fixed checkboxes saving invalid values. 2014-09-22 18:50:48 +10:00
Marc Zinnschlag
5c8ef842b6 Merge branch 'edit' 2014-09-22 09:54:44 +02:00
Marc Zinnschlag
51151bc43e minor fix 2014-09-22 09:53:07 +02:00
cc9cii
fc8d6da6a2 Added more shader settings. 2014-09-22 16:24:06 +10:00
cc9cii
71a3880884 Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout. 2014-09-22 12:19:18 +10:00
cc9cii
02f8f54192 Fixed checkbox behaviour. Added some shader settings. 2014-09-22 07:50:35 +10:00
cc9cii
17a74da650 Cleaned up comments and dead code. 2014-09-21 21:10:18 +10:00
cc9cii
dbd1ab05d3 Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating. 2014-09-21 20:55:52 +10:00
Marc Zinnschlag
9d316a8745 Merge branch 'records' 2014-09-20 13:59:45 +02:00
Marc Zinnschlag
8499ceb35d set default value for topic when cloning info records 2014-09-20 13:30:36 +02:00
Marc Zinnschlag
8ce87803c4 set default value for cell when cloning references 2014-09-20 12:54:25 +02:00
Marc Zinnschlag
b39cdb7645 fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI) 2014-09-20 12:48:51 +02:00
Marc Zinnschlag
90ad3f332a extending refnum functionality to cloning (and also enable cloning of references to a different cell) 2014-09-20 12:37:25 +02:00
cc9cii
5dfcd2ed01 Removed standard window size combobox. Rearranged widgets. 2014-09-19 08:29:06 +10:00
cc9cii
52354b14fc Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled. 2014-09-18 22:17:37 +10:00
Marc Zinnschlag
3add4bdf35 rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet) 2014-09-18 13:41:29 +02:00
Marc Zinnschlag
6fbffdb98f fixed reference creator error handling 2014-09-18 12:39:29 +02:00
Marc Zinnschlag
e93ab383ea set refnum and increment refnum counter when creating a new reference 2014-09-18 12:25:17 +02:00
cc9cii
575780ec0d Display format settings working. 2014-09-18 17:13:53 +10:00
cc9cii
d9b0c81299 Show status bar setting working (feature #854). Turns out signals were not needed, may need to clean up later. 2014-09-18 16:05:32 +10:00
Stanislav
313bdf4e78 fix 2014-09-18 10:25:33 +06:00
cc9cii
86636bd960 Mouse events to disabled objects implemented via a signal filter. 2014-09-18 12:23:41 +10:00
cc9cii
62d2811285 Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events. 2014-09-18 07:52:54 +10:00
U-NSFW-50TH\cc9c
ca80a2b856 Merge remote-tracking branch 'upstream/master' into opencs-settings 2014-09-17 21:00:22 +10:00
cc9cii
9dc4af69c6 Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible. 2014-09-17 17:13:21 +10:00
Stanislav
ebb223b2d3 Feature #1226: fixes 2014-09-17 09:03:02 +06:00
cc9cii
cb15750e40 Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway. 2014-09-17 06:29:11 +10:00
cc9cii
e3da37567b Cleaned up and got some signals going. 2014-09-17 06:11:41 +10:00
Marc Zinnschlag
70275350de rewrote command generation in GenericCreator 2014-09-16 13:28:11 +02:00
Marc Zinnschlag
b31c4e2bcd Merge remote-tracking branch 'cc9cii/Bug-No-1301' 2014-09-16 12:52:12 +02:00
cc9cii
d679e0e012 Made more progress. Grey out disabled settings. 2014-09-16 19:50:25 +10:00
cc9cii
ffaca7a875 GUI added, but not yet functional. 2014-09-16 07:44:07 +10:00
Stanislav
8574d2330c Feature #1226: Request UniversalId editing from table column 2014-09-16 00:00:34 +06:00
cc9cii
e4b836608c Partially address feature #854 by reading the status bar setting from opencs.ini. Missing GUI update that will affect new top level windows. 2014-09-15 06:08:56 +10:00
Marc Zinnschlag
d1d861e1be Merge branch 'run' 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
 2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009 allow project scope scripts 2014-09-14 11:41:28 +02:00
Marc Zinnschlag
1254198d90 add debug profiles to scene subviews view drag and drop 2014-09-13 18:54:29 +02:00
Marc Zinnschlag
3ed2edb7cb rewrote run tool profile management 2014-09-13 18:53:35 +02:00
Marco Melletti
f212f0e4d2 subviews now get destroyed on close 2014-09-12 16:45:21 +02:00
Marc Zinnschlag
70ee899691 Merge remote-tracking branch 'cc9cii/Bug-No-1725' 
Conflicts:
	apps/opencs/model/tools/bodypartcheck.cpp
 2014-09-12 14:37:26 +02:00
Marc Zinnschlag
b8fdccdbff Merge remote-tracking branch 'cc9cii/Bug-No-1864' 2014-09-12 14:33:17 +02:00
Marc Zinnschlag
717c1b15f5 fixed drop implementation for unpaged worldspace (wasn't updating cell object) 2014-09-11 13:08:30 +02:00
Marc Zinnschlag
0db288ce07 generalising and cleaning up drop implementation of worldspace widget 2014-09-11 13:04:20 +02:00
Marc Zinnschlag
5a9376450b some cleanup of the scene view drop code 2014-09-11 11:27:56 +02:00
cc9cii
88cf2bd597 Deal with signal source being overloaded. Clear filename after creating a new addon. Enable "Open" button if a game file is already selected. 2014-09-11 07:27:48 +10:00
cc9cii
faac91472c Allow '-' and '_' in new addon name. Resolves Bug #1789. 2014-09-10 23:30:42 +10:00
cc9cii
85596322f3 Update status bar when record filter is changed. Should resolve Bug #1290. 2014-09-10 23:13:56 +10:00
cc9cii
ae0fb77e30 Move recordfilterbox label 2 pixels to right. Resolves Bug #1839. 2014-09-10 21:23:38 +10:00
cc9cii
227eb12295 Added document name to showModifiedDocumentMessageBox. 2014-09-10 20:29:47 +10:00
cc9cii
f7c1b169b3 Place the settings window on the center of window with keyboard focus. Should resolve Bug #1838. 2014-09-10 20:00:07 +10:00
cc9cii
89f7608022 Refactor for better legibility. 2014-09-10 14:40:41 +10:00
cc9cii
77171b788b Made popup messagebox non-modal. 2014-09-10 14:03:25 +10:00
cc9cii
3a5ed9c5bb Build objects and connections only once. 2014-09-10 07:14:01 +10:00
cc9cii
fdc20c595d Fix gcc compile error. 2014-09-09 21:24:54 +10:00
cc9cii
4471fe771e Fix logic errors. 2014-09-09 21:09:37 +10:00
cc9cii
84f5784575 Remove document when closing the last view. Should resolve Bug #1292. 2014-09-09 13:04:48 +10:00
cc9cii
ad8d722763 Close documents rather than views. 2014-09-09 10:05:06 +10:00
cc9cii
5675626482 Cleanup signals when finished. 2014-09-09 07:24:18 +10:00
cc9cii
724ed807c8 Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable. 2014-09-08 23:14:04 +10:00
cc9cii
988c8f9ebe Ignore duplicate connections. 2014-09-08 16:18:31 +10:00
Marc Zinnschlag
3f24593dba added profile selection panel 2014-09-07 14:40:50 +02:00
Marc Zinnschlag
4337d05126 added right-click handling support to SceneTool class 2014-09-07 13:35:30 +02:00
Marc Zinnschlag
f913d51e35 remove deleted debug profiles from run tool 2014-09-07 12:55:52 +02:00
cc9cii
cedf1171e3 Cleanup comments. 2014-09-07 18:37:33 +10:00
cc9cii
dba352fd6f Check all views before exiting. 2014-09-07 18:35:50 +10:00
cc9cii
4a8fe39b2c For bug #1710. Change the ID type of mime data for filterbox drop events to Referenceable rather than using the ID's native type. 2014-09-07 06:29:09 +10:00
Marc Zinnschlag
51128d2d57 added run button to scene subview toolbar 2014-09-06 16:11:06 +02:00
cc9cii
c78ac391a0 Made the Region field for Cell record in dialogue subview editable but not sure if this is the wanted behaviour. 
Also removed a duplicate UniversalId::Type_Class mappin in tablemimedata.cpp.
 2014-09-06 20:24:34 +10:00
Marc Zinnschlag
cf05d3c69f added run log 2014-09-05 13:49:34 +02:00
Marc Zinnschlag
a728d6d77a full implementation of global run menu item (replaces earlier placeholder implementation) 2014-09-04 17:45:43 +02:00
Marc Zinnschlag
67dfaa7f35 update actions in main menu when creating a new view 2014-09-04 10:47:30 +02:00
Marc Zinnschlag
bee36c9167 block saving while OpenMW process is running 2014-09-02 11:59:04 +02:00
Marc Zinnschlag
c88b3a1520 track state of OpenMW process and enable/disable run/stop actions accordingly 2014-09-02 11:56:35 +02:00
Marc Zinnschlag
1b4ab6e130 added OpenMW runner 2014-09-02 10:21:17 +02:00
Marc Zinnschlag
96cd46568b some cleanup 2014-09-01 11:15:59 +02:00
Marc Zinnschlag
bec6c4e726 fixed editor creation for Display_LongString 2014-09-01 10:56:38 +02:00
Marc Zinnschlag
7e653cebdf implement script editor via QPlainTextEdit instead of QTextEdit 2014-09-01 10:52:10 +02:00
Marc Zinnschlag
03c0cbc65a added owner global column to references table (Fixes #1695) 2014-08-30 10:13:34 +02:00
Marc Zinnschlag
ea4cd94c25 syntax highlighter modes 2014-08-24 17:56:20 +02:00
Marc Zinnschlag
5c536d571b added script column to debug profile table (dialogue only) 2014-08-24 13:15:18 +02:00
Marc Zinnschlag
30830d0693 make delegates use the whole document instead of the undo stack 2014-08-23 12:25:12 +02:00
Marc Zinnschlag
232c6c9ad3 Merge branch 'scriptedit' into run 2014-08-22 13:20:02 +02:00
Marc Zinnschlag
be61ed0f6a minor cleanup 2014-08-22 13:18:47 +02:00
Marc Zinnschlag
c2e3709d0f moved syntax highlighter from ScriptSubView to ScriptEdit 2014-08-22 12:49:34 +02:00
Marc Zinnschlag
d4981c3037 moved change lock from ScriptSubView to ScriptEdit 2014-08-21 14:50:13 +02:00
Marc Zinnschlag
2f08d44313 moved script widget configuration code from ScriptSubView to ScriptEdit 2014-08-17 15:25:22 +02:00
Marc Zinnschlag
06e1cfe613 added missing allowed drop types for script edit (script and region) 2014-08-15 14:41:34 +02:00
Marc Zinnschlag
58916a7731 fixed creator for filter dialogue subview 2014-08-15 13:37:37 +02:00
Marc Zinnschlag
6f97fa472e added dialgoue subview for debug profiles 2014-08-15 13:35:53 +02:00
Marc Zinnschlag
2b9395333a fixed error detection and improved error reporting in IdValidator 2014-08-15 13:11:55 +02:00
Marc Zinnschlag
605f71ecc0 added creator to debug profile table 2014-08-15 12:03:07 +02:00
Marc Zinnschlag
1bf177fe72 fixed double namespace in GenericCreator 2014-08-15 12:01:37 +02:00
Marc Zinnschlag
c66dfe67b1 integrated namespace widget into input field (GenericCreator) 2014-08-14 14:21:34 +02:00
gus
1ac220593d clean up 2014-08-12 21:32:07 +02:00
gus
11922dc53a code is shorter, thanks scrawl 2014-08-12 17:41:13 +02:00
gus
465914c77c more clean up 2014-08-12 17:20:02 +02:00
gus
321d385a5d clean up 2014-08-12 17:18:08 +02:00
gus
d4d8f07bf3 clean up 2014-08-12 13:32:56 +02:00
gus
e9cc1df69e use QPainter 2014-08-12 13:31:32 +02:00
Marc Zinnschlag
98fa789904 fixed mixed-up tooltip 2014-08-12 11:07:54 +02:00
Marc Zinnschlag
2df1079dd4 removed mScope field from Filter record (redundant now) 2014-08-10 20:49:14 +02:00
Marc Zinnschlag
a54efbcfa0 made FilterCreator redundant by generalising GenericCreator 2014-08-10 18:46:32 +02:00
Marc Zinnschlag
35803bc9b6 added scope configuration to creators 2014-08-07 09:32:49 +02:00
Marc Zinnschlag
4d49924025 added debug profile record table 2014-08-04 13:36:01 +02:00
Marc Zinnschlag
3f6a7e36d0 removed the (partial broken) return/enter shortcut for custom push buttons, since there is already a space shortcut) 2014-08-01 09:50:49 +02:00
Marc Zinnschlag
1e6d557089 Merge branch 'visibility' 2014-07-31 14:34:25 +02:00
Marc Zinnschlag
f381451ae0 added control element selector toolbar button 2014-07-31 14:33:38 +02:00
Marc Zinnschlag
612202a7a5 fixed several bugs in the layout algorithm of the toggle scene tool 2014-07-31 14:33:12 +02:00
Marc Zinnschlag
507e5c4f6e explicitly flag scene as modified when changing visibility mask 2014-07-31 14:29:52 +02:00
Marc Zinnschlag
439ba57d46 added visual element selector toolbar button 2014-07-31 14:06:04 +02:00
Marc Zinnschlag
a25758c3b1 fixed visibility flags setting 2014-07-31 14:02:55 +02:00
Marc Zinnschlag
b0a9d17dc3 use name as a tooltip if no tooltip is given for scene tool bar toggle buttons 2014-07-31 13:26:23 +02:00
Marc Zinnschlag
92d322cbd1 added visibility flags 2014-07-31 13:25:30 +02:00
Marc Zinnschlag
71ce78f949 added scene toolbar toggle widget 2014-07-31 13:05:08 +02:00
Marek Kochanowicz
13ee469b70 saving progress 2014-07-30 17:07:11 +02:00
Marc Zinnschlag
7a5f73de9e added navigation mode icons to buttons 2014-07-30 17:02:23 +02:00
Marc Zinnschlag
4421e7a5cc added lighting mode toolbar icons 2014-07-25 11:15:04 +02:00
Marek Kochanowicz
cdac934315 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-07-25 11:13:52 +02:00
gus
baf6cca051 modified tab to space 2014-07-22 13:32:15 +02:00
gus
195767db7f link back to OGre Wiki for some copied past code 2014-07-22 12:25:31 +02:00
gus
546b44a3be bugfixes 2014-07-22 12:10:58 +02:00
gus
875daed4ec Merge branch 'master' of https://github.com/OpenMW/openmw.git into QtOGre 2014-07-22 11:09:53 +02:00
gus
a5058625b3 clean up + toggle function for the billboard 2014-07-21 18:57:35 +02:00
gus
f8019b4a97 added a bilboard with the Cell coord. Can't be toggled off yet, and no clean up too. 2014-07-21 18:35:51 +02:00
Marc Zinnschlag
1a1f5dfc4a added tooltips to dialgoue subview buttons 2014-07-15 12:46:52 +02:00
Marc Zinnschlag
0430558c3c fixed focussed button in mode tool panel when panel is opened 2014-07-14 14:17:27 +02:00
Marc Zinnschlag
17fc570e38 new keyboard shortcut (T): move focus from toolbar to scene widget 2014-07-14 13:49:55 +02:00
Marc Zinnschlag
92af093856 new keyboard shortcut (T): move focus from scene widget to toolbar 2014-07-14 11:19:59 +02:00
Marc Zinnschlag
688d413b8c when scene toolbar gains focus, focus first button 2014-07-14 11:06:12 +02:00
Marc Zinnschlag
c2ea8f3f0a added self-adjusting tooltips to the top-level toolbar buttons 2014-07-13 14:21:50 +02:00
Marc Zinnschlag
26f87f5d23 added navigation mode button tooltips 2014-07-13 12:15:05 +02:00
Marek Kochanowicz
4b4a72c3b6 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 2014-07-13 10:52:39 +02:00
Marc Zinnschlag
e855e55318 added tooltip to user settings button on startup window 2014-07-13 10:52:33 +02:00
Marc Zinnschlag
490442cf62 added lighting mode tooltips 2014-07-10 13:18:24 +02:00
Marc Zinnschlag
61a02d8a40 replaced custom toolbutton push flag with type enum 2014-07-10 13:04:30 +02:00
Marc Zinnschlag
32e48edb83 toolbar tooltip system 2014-07-10 12:53:57 +02:00
Marc Zinnschlag
67ad7d5b0e fixed scene subview focus problem 2014-07-10 12:20:48 +02:00
Marc Zinnschlag
57b9b8d884 set focus when opening a toolbar panel 2014-07-10 12:13:27 +02:00
Marc Zinnschlag
d6c0b8d0ac use custom button on toolbar (top level) 2014-07-10 11:45:45 +02:00
Marc Zinnschlag
44b95bbd7b added push mode and icon-less push button constructor 2014-07-10 11:45:20 +02:00
Marc Zinnschlag
8b239df1b1 removed text argument from button constructor, because toolbar buttons will always be icon only 2014-07-10 11:34:09 +02:00
Marc Zinnschlag
365b721878 return/enter activate the selected button 2014-07-10 11:32:20 +02:00
Marc Zinnschlag
50ee815dd8 make buttons in mode panel act like radiobuttons 2014-07-10 11:23:48 +02:00
Marc Zinnschlag
dd0aa20390 custom push button 2014-07-10 11:03:55 +02:00
Marc Zinnschlag
930f782bc5 SceneWidget::setLighting was missing an update call 2014-07-10 10:09:21 +02:00
Marc Zinnschlag
03f67cd6bd moved low level widgets from CSVWorld into a separate namespace/directory 2014-07-08 12:39:12 +02:00
Marc Zinnschlag
1548f4670a drop part of resources drag and drop 2014-07-08 09:51:17 +02:00
Marc Zinnschlag
b6c5ee125d more refactoring 2014-07-08 09:24:05 +02:00
Marc Zinnschlag
9d5956585c added separate display type for colours 2014-07-08 09:08:01 +02:00
Marek Kochanowicz
d221486a14 Fixed problem in the idtable. 2014-07-07 12:16:53 +02:00
Marek Kochanowicz
3262f8d774 make dtor virtual 2014-07-07 10:27:48 +02:00
Marek Kochanowicz
acc8432705 fixed segfault 2014-07-07 10:23:40 +02:00
Marc Zinnschlag
19828df799 added subviews for resources tables 2014-07-05 15:51:17 +02:00
Marc Zinnschlag
42db9a5091 make modification column optional in table views 2014-07-05 15:50:17 +02:00
Marc Zinnschlag
e171babd2f added Feature_Constant to IdTable 2014-07-05 12:44:11 +02:00
Marc Zinnschlag
1b1f1bade3 injected new class IdTableBase between QAbstractItemModel and IdTable 2014-07-04 13:25:56 +02:00
Marek Kochanowicz
77afb754e5 adding new rows works 2014-07-02 13:13:03 +02:00
Marek Kochanowicz
c50cecdc64 Small cleanup 2014-07-01 21:13:27 +02:00
Marek Kochanowicz
fcd082c6a5 added option to add or remove rows 2014-07-01 20:52:27 +02:00
Marc Zinnschlag
37a2b48fa2 added missing type columns to body part table 2014-07-01 14:28:12 +02:00
Marc Zinnschlag
d96ed38d49 added body part table 2014-07-01 12:37:22 +02:00
Marc Zinnschlag
5649552f18 added other missing columns for enchantment table; fixed dialogue subviews for enchantment records 2014-07-01 09:50:43 +02:00
Marc Zinnschlag
ab8bee4d1a added enchantment type column to enchantment table 2014-07-01 09:42:56 +02:00
Marc Zinnschlag
395c45c88b Merge branch 'editorfixes' into tables 2014-06-30 20:49:41 +02:00
Marc Zinnschlag
e97fd35ae6 added enchantments table 2014-06-30 20:40:34 +02:00
Marek Kochanowicz
172f1a1301 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 2014-06-30 20:06:44 +02:00
Marek Kochanowicz
3ebc469f04 prepering for merge 2014-06-30 20:06:18 +02:00
Marc Zinnschlag
a25321f07e update paged scene view according to changes made to cell records 2014-06-30 17:57:38 +02:00
Marc Zinnschlag
5fb2e1a877 do not render deleted exterior cells in scene view 2014-06-30 17:33:03 +02:00
Marek Kochanowicz
6dc199743c store undoStack in the nestedtable 2014-06-30 16:03:38 +02:00
Marek Kochanowicz
c96d48fb91 Nested model supports editing now. 2014-06-30 14:12:57 +02:00
Marek Kochanowicz
5eac32e3d3 added nestedtable for displaying nested content. 2014-06-30 13:09:10 +02:00
Marek Kochanowicz
8c6a0d9a4f created new files 2014-06-29 21:12:31 +02:00
Marc Zinnschlag
2fe2def64c added cell rendering in paged worldspaces 2014-06-29 16:00:06 +02:00
Marc Zinnschlag
a6626b94c8 added cell rendering in unpaged worldspaces 2014-06-29 14:19:10 +02:00
Marc Zinnschlag
74ed9cbb2d added cell rendering class 2014-06-29 14:18:46 +02:00
Marc Zinnschlag
c35b87de95 various Object class fixes 2014-06-28 11:25:28 +02:00
Marc Zinnschlag
099c406226 Merge branch 'objects' 2014-06-27 11:55:28 +02:00
Marc Zinnschlag
6020edf60f make preview watch for changes in modification state of relevant records 2014-06-27 11:55:02 +02:00
Marc Zinnschlag
a2f514f024 disabled preview function for deleted records 2014-06-27 11:38:34 +02:00
Marc Zinnschlag
36c1170d09 fixed some function names 2014-06-27 10:35:00 +02:00
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
Marek Kochanowicz
873cfcf447 implemented basic headerData (still work in progress) 2014-06-18 17:34:21 +02:00
Marek Kochanowicz
b63f2f4cd5 Actually using new nestedmodel 2014-06-18 16:56:37 +02:00
Marek Kochanowicz
ce5e889015 Nested table sits inside it's own layout now. 2014-06-17 20:12:14 +02:00
Marek Kochanowicz
defd0b1754 Merge branch 'dialog-fix' into NonTableFields 
TODO stop failing epicly with git
 2014-06-17 14:08:59 +02:00
Marek Kochanowicz
bbe7854968 Corrected formatting to follow our standard better. 2014-06-17 10:46:54 +02:00
Marek Kochanowicz
d6288a8055 Remove unneded revert and delete slots 2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a refactoring dialogue subview 2014-06-16 11:31:57 +02:00
Marek Kochanowicz
7eb82f74ae Fixed complitaion. 2014-06-16 10:22:14 +02: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
Marek Kochanowicz
8763309a1b reformatting to make code easier to read 2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9 check if index is valid before attempting to use it 2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac correcting problems 2014-06-09 13:16:10 +02:00
Marek Kochanowicz
269a357644 Merge remote-tracking branch 'master/refs' into dialog-fix 
Conflicts:
	CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/dialoguesubview.cpp
 2014-06-09 11:51:41 +02:00
Marek Kochanowicz
6f5935edb3 subview does not store row number anymore 2014-06-09 11:37:48 +02:00
Marek Kochanowicz
29231b8fc9 starting new branch 2014-06-09 10:26:53 +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
Marek Kochanowicz
55d451febe changes in the model (idtable) to support nested data 2014-06-02 20:41:37 +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