mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 06:45:32 +00:00
Code Issues Releases Wiki Activity
13928 commits 38 branches 54 tags 122 MiB
Commit graph

344 commits

Author SHA1 Message Date
cc9cii
71077fda6a Disable toolbar context menu. Should resolve bug #2953. 
(cherry picked from commit 64821b0785)
 2015-11-01 22:48:01 +11:00
cc9cii
9cc046ce4e Further rationalise the use of ColumnIds 
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755

(cherry picked from commit 998348e606)
 2015-11-01 22:46:18 +11:00
Marc Zinnschlag
14708e181c more cleanup 
(cherry picked from commit 659b87b25f)

Conflicts:
	apps/opencs/view/doc/view.hpp
 2015-11-01 21:35:43 +11:00
cc9cii
41f2ffdebb Rationalise the use of ColumnIds 
(cherry picked from commit c4a900ca2c)

Conflicts:
	apps/opencs/model/world/refidcollection.cpp
 2015-11-01 20:28:13 +11:00
Marc Zinnschlag
c2ed475950 disable merge menu item when a merge is already in progress 
(cherry picked from commit 708cacdec4)
 2015-11-01 13:23:09 +11:00
Marc Zinnschlag
a5a0990d3c improved adjuster widget problem reporting 
(cherry picked from commit 4fd3097c1c)
 2015-11-01 13:22:54 +11:00
Marc Zinnschlag
ef1e01639e added UI for merge tool (merge tool itself is still missing) 
(cherry picked from commit b83f9445a9)

Conflicts:
	apps/opencs/editor.cpp
	apps/opencs/editor.hpp
 2015-11-01 13:22:42 +11:00
Marc Zinnschlag
6fb658daa4 replaced State_Compiling (not requried anymore) with State_Merging 
(cherry picked from commit 6a9218ee07)
 2015-11-01 13:19:56 +11:00
Stanislav Bas
8c07d7f252 Remove enum names for AiWanderRepeat column 2015-09-08 06:46:10 +10:00
scrawl
f8f66bffb0 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-09-08 06:40:06 +10:00
taras.kudryavtsev
0f2ea57648 #2730 and #2725 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-09-08 06:29:25 +10:00
Stanislav Bas
11f5a928db Don't allow empty value of School field in Magic Effects table 2015-09-08 06:20:41 +10:00
cc9cii
5538f822f4 Initial support for Land and LandTexture tables. Updates Features #936 and #933. 2015-08-01 07:50:56 +10:00
cc9cii
740c8bc6f1 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/world/dialoguesubview.cpp
 2015-07-27 10:53:39 +10:00
Marc Zinnschlag
6769479358 moved code for initiating record cloning from DialogueSubView to RecordButtonBar 2015-06-27 13:47:07 +02:00
cc9cii
2076acec10 Merge branch 'master' into cc9cii 2015-06-27 09:29:41 +10:00
Marc Zinnschlag
1e033fa8fe added meta data dialogue sub view 2015-06-26 16:11:00 +02:00
cc9cii
3b27e643b8 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2015-06-19 07:49:18 +10: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
cc9cii
f989bfcd42 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
 2015-06-09 19:42:37 +10: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
680e46441d Feature #2533. Similar but less complete implementation PR was not accepted (see https://github.com/OpenMW/openmw/pull/276#issuecomment-57612802). 
- User preferences setting to save the window state (position, geometry, etc) at the time of exit.
- User preferences setting to workaround some X window managers not keeping pre-maximised state.
- Uses opencs.ini to store window states between sessions.
 2015-05-12 08:21:05 +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