mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:19:55 +00:00
Code Issues Releases Wiki Activity
28373 commits 38 branches 54 tags 122 MiB
Commit graph

390 commits

Author SHA1 Message Date
cc9cii
64821b0785 Disable toolbar context menu. Should resolve bug #2953. 2015-10-09 06:29:50 +11:00
cc9cii
998348e606 Further rationalise the use of ColumnIds 
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
 2015-10-08 12:35:09 +11:00
Marc Zinnschlag
659b87b25f more cleanup 2015-09-17 11:31:25 +02:00
cc9cii
c4a900ca2c Rationalise the use of ColumnIds 2015-09-12 09:33:11 +10:00
Marc Zinnschlag
a445683312 Merge branch 'mergetool' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-09-11 13:22:15 +02:00
Stanislav Bas
aeb1acca51 Remove enum names for AiWanderRepeat column 2015-08-21 22:05:40 +03:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
Marc Zinnschlag
708cacdec4 disable merge menu item when a merge is already in progress 2015-08-08 16:47:58 +02:00
Marc Zinnschlag
23ccee0124 Merge remote-tracking branch 'dieho/master' 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-08-08 11:00:44 +02:00
Marc Zinnschlag
4fd3097c1c improved adjuster widget problem reporting 2015-08-06 12:58:52 +02:00
Marc Zinnschlag
b83f9445a9 added UI for merge tool (merge tool itself is still missing) 2015-08-06 12:52:10 +02:00
taras.kudryavtsev
8ae7c63c45 #2730 and #2725 2015-08-04 16:58:44 +03:00
Stanislav Bas
cbc8309289 Don't allow empty value of School field in Magic Effects table 2015-08-04 16:19:00 +03:00
Marc Zinnschlag
6a9218ee07 replaced State_Compiling (not requried anymore) with State_Merging 2015-07-30 11:49:24 +02:00
Marc Zinnschlag
6769479358 moved code for initiating record cloning from DialogueSubView to RecordButtonBar 2015-06-27 13:47:07 +02:00
Marc Zinnschlag
1e033fa8fe added meta data dialogue sub view 2015-06-26 16:11:00 +02:00
Stanislav Bas
850f612c8b Merge branch 'master' into feature-color-picking 2015-06-16 22:39:12 +03:00
cc9cii
cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 2015-06-16 12:48:45 +10:00
Stanislav Bas
f19d07b404 Rename ColorPickerDelegate to ColorDelegate 2015-06-12 23:09:31 +03:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
Marc Zinnschlag
8d22d26669 Merge remote-tracking branch 'cc9cii/scrollbar-fix' 2015-06-10 18:51:14 +02:00
Stanislav Bas
d7fb497255 Color values are displayed as colored rectangles in tables 2015-06-08 21:33:23 +03:00
Stanislav Bas
b25cc6bc55 IdCompletionManager uses Display type instread of ColumnId for creating completers 2015-06-03 12:01:13 +03:00
Stanislav Bas
994c6833bc Add missing columns for the ID completion 2015-05-30 23:54:16 +03:00
Stanislav Bas
5e8718d8b2 Add the ID completion delegate factory to the delegate factory collection 2015-05-30 18:37:13 +03:00
Marc Zinnschlag
88d5aed62d removed code that interfered with the default window size on Linux (Fixes #2568) 2015-05-30 12:05:35 +02:00
cc9cii
0aaac59cc3 Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588. 2015-05-30 08:37:58 +10:00
cc9cii
ce421b230b Move scrollbar to newly opened subview. Should resolve Bug #2576. 2015-05-29 14:07:41 +10:00
cc9cii
c721e340d8 Merge branch 'master' into npc-additional-data 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-05-24 19:24:27 +10:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
cc9cii
0ecfd9119f Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546. 2015-05-19 06:56:38 +10:00
Marc Zinnschlag
5176e3d84b Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar' 2015-05-18 16:46:03 +02:00
cc9cii
cfcfb17320 Updates to optional horizontal scrollbar. 
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
 2015-05-18 07:12:02 +10:00
Marc Zinnschlag
7b207a7954 added shortcut for closing subviews (Fixes #2558) 2015-05-17 14:31:53 +02:00
Marc Zinnschlag
93c3bb3716 fixed subview-closing related crash (Fixes #2564) 2015-05-17 14:27:17 +02:00
cc9cii
e9ca022162 Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549. 
- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
  Grow Only: No change to current, except the use of size hints
  Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
  Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.
 2015-05-17 20:45:13 +10:00
cc9cii
0c461f4424 Add TopicInfos special conditions table. 2015-05-09 21:21:16 +10:00
Marc Zinnschlag
048d7be87c Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516) 2015-05-03 16:35:10 +02:00
cc9cii
f326b14604 Allow Qt to cleanup its signals. 2015-04-21 10:25:19 +10:00
cc9cii
f88be67556 Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate 2015-04-18 09:37:19 +10:00
cc9cii
e241fb0104 Convert clothing/armour part reference type column in the nested tables to use enum delegates. 2015-04-18 08:31:08 +10:00
cc9cii
e00d7f72ac Convert magic effects ID and Range columns in the nested tables to use enum delegate 2015-04-18 08:09:14 +10:00
cc9cii
befd6fe658 Convert magic effects Skills column in the nested tables to use enum delegates. 2015-04-18 07:15:40 +10:00
cc9cii
47d5eac290 Merge branch 'master' into NonTableFields 
Conflicts:
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/idtable.hpp
 2015-04-17 12:37:34 +10:00
Marc Zinnschlag
38ce074a62 Merge branch 'replace' 2015-04-16 20:11:25 +02:00
cc9cii
7990fab708 Fix crash when exiting via window manager on some systems. 2015-04-10 18:09:33 +10:00
Marc Zinnschlag
23cf859fee added search stages (cell table only for now) 2015-03-27 16:33:54 +01:00
Marc Zinnschlag
413b35de6c moved search menu item from view to edit 2015-03-19 21:03:24 +01:00
Marc Zinnschlag
d053c62032 setting up global search operation and subview 2015-03-17 12:30:47 +01:00
scrawl
19e8280f45 OpenCS window title unicode fixes 2015-03-16 15:45:41 +01:00
Marc Zinnschlag
fc6c9d7ff2 Merge remote-tracking branch 'scrawl/opencs-hint-fix' 2015-03-16 08:41:36 +01:00
scrawl
6ff2523d8a Fix for line focus when clicking on a verifier script error 
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
 2015-03-16 03:07:37 +01:00
scrawl
295ca86ac1 OpenCS FileDialog crash fix 
The file dialog would crash when no game file is selected and an addon file with no dependency is checked, then unchecked.
 2015-03-16 02:43:02 +01:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
Marc Zinnschlag
a148b851c0 added start script table 2015-03-03 14:32:12 +01:00
cc9cii
1ee6153940 Remove unnecessary boolean passing between objects. 2015-03-02 06:51:31 +11:00
cc9cii
c4625b94e5 Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS. 2015-03-01 12:52:43 +11:00
Bret Curtis
5672c86924 Rename window title for OpenMW-CS 2015-02-24 23:37:53 +01:00
cc9cii
e5c1c31648 Ignore case when detecting legacy extensions (.esm or .exp). Should resolve bug #2227. 2015-02-16 14:27:25 +11:00
Marc Zinnschlag
fa4718283d Merge remote-tracking branch 'scrawl/contentselector' 2015-01-21 15:23:38 +01:00
scrawl
b39cc0c8c8 Fix OpenCS window opening issue when config file doesn't exist 
It would attempt to create a zero-sized window (or even negative-sized, after subtracting the frame dimensions).
 2015-01-15 02:49:54 +01:00
Marc Zinnschlag
9f6a2d00e8 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2015-01-02 18:17:25 +01:00
Marc Zinnschlag
bdc28c0523 Merge remote-tracking branch 'maqifrnswa/feature1325' 2015-01-02 18:14:42 +01:00
Scott Howard
f24c1845b6 remove pop-up message on load failure 2015-01-02 10:42:09 -05:00
Scott Howard
dece4e2640 remove unneeded includes 2015-01-01 22:54:32 -05:00
Scott Howard
ce7cef924e when loading a file fails, pop-up critical window and highlight error text 2015-01-01 22:27:08 -05:00
Thoronador
91ff536460 fix uninit, #2 2015-01-02 00:26:45 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
cc9cii
64e1594b41 Move the destruction of global resources, being used by multiple documents, to the editor. 2014-12-01 14:08:27 +11:00
cc9cii
2720e5ea9d Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application. 2014-12-01 06:44:12 +11:00
cc9cii
911839bb91 Simplify detecting whether a universal id represents a referenceable type. 2014-11-21 06:48:42 +11:00
cc9cii
ede1b97b46 Check the type of universal id before getting its id. Should resolve bug #2137 2014-11-19 18:10:29 +10:00
cc9cii
c6a2461fbd Delay removing physics until the document is closed. Also other general cleanup. 2014-11-01 20:51:04 +11:00
cc9cii
b328aa1fb9 Multiple document support. 2014-11-01 18:57:39 +11:00
cc9cii
057982b1f8 Fix Subview interface clutter by keeping a map of Scenewidgets. 2014-11-01 08:29:08 +11:00
cc9cii
fbadaf55ee Multiple SceneManagers per physics engine now working. 2014-10-31 21:50:57 +11:00
Marc Zinnschlag
e604fcf282 Merge branch 'double' 2014-10-27 09:56:52 +01:00
Marc Zinnschlag
6f4b753750 replaced regular function call from SubView to View with signal-slot-connection 2014-10-27 09:51:55 +01:00
Marc Zinnschlag
1aef9304e9 replaced the signal/slot user settings update with a regular function call 2014-10-27 09:44:18 +01:00
Marc Zinnschlag
275bf854ed added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window) 2014-10-27 08:57:18 +01:00
cc9cii
95683bc8c3 Add user interface for top level window status-bar setting (implementation already existed). For feature #854. 2014-10-26 15:04:52 +10:00
Marc Zinnschlag
aad13e6bff close view when closing last sub-view unless this view is the last view 2014-10-25 18:13:56 +02:00
Marc Zinnschlag
4b921c3876 user settings cleanup 2014-10-17 13:49:33 +02:00
scrawl
e413bebe99 Toggle addon files when activated or clicked on checkbox rather than clicked (Fixes #1980) 2014-10-16 15:07:51 +02:00
Thoronador
46496a35a1 fix uninitialized pointer variable in CSVDoc::SubView class 2014-10-12 23:42:44 +02:00
Marc Zinnschlag
21b16f8425 Merge branch 'tables' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
 2014-10-10 16:11:54 +02:00
cc9cii
115841d31d Do not save window size on exit. 2014-10-03 05:59:24 +10: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
Marc Zinnschlag
ff530a2e19 added missing magic effect table columns 2014-09-30 12:33:48 +02: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
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
61bab6b1f1 Sanitised version. Some settings are only accessible via manually editing the config file. 2014-09-25 08:15:07 +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
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
437fb774c5 Re-implemented subview minimum size setting. 2014-09-23 07:16:07 +10:00