mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-25 22:39:42 +00:00
Code Issues Releases Wiki Activity
14116 commits 108 branches 68 tags 135 MiB
Commit graph

1335 commits

Author SHA1 Message Date
cc9cii
c2ea682f0e Set editor limits on hard-coded string lengths (Bug #3066) 
- See https://forum.openmw.org/viewtopic.php?f=2&t=3233 and https://bugs.openmw.org/issues/3066
 2015-12-20 15:02:18 +11:00
cc9cii
a967418a5a Fix Preview and Unpaged World subviews not rendering. Not sure if this is related to a later version of Ogre being used. 2015-12-06 19:50:26 +11:00
cc9cii
ff072441fd Change the loader's top progress bar to show total number of records processed rather than the number of files. 2015-12-06 19:48:56 +11:00
cc9cii
77394fce99 Fix table being sorted twice (at least it appeared that way according to the sample profiler) 
- Quoting Qt-4.8: "Note: . Setting the property to true with setSortingEnabled() immediately triggers a call to sortByColumn() with the current sort section and order."
 2015-12-05 20:38:09 +11:00
cc9cii
f029682057 Merge branch 'cc9cii' into minor-enhancements 
Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/refidcollection.cpp
 2015-12-05 19:55:32 +11:00
scrawl
3c02703876 Not found Land Textures are no longer a fatal error (Bug #3037) 
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.

(cherry picked from commit 35fa1f5865)
 2015-12-05 18:14:55 +11:00
Marc Zinnschlag
ec00bd2c98 make initial size of script error panel configurable (Fixes #2996) 
(cherry picked from commit 99500f4021)
 2015-12-05 17:45:58 +11:00
Marc Zinnschlag
8c4d414635 remember script error panel height per scriptsubview 
(cherry picked from commit f5c61ee616)
 2015-12-05 17:45:45 +11:00
Marc Zinnschlag
8da783d877 do not adjust error panel height if panal was already open 
(cherry picked from commit 26640d17eb)
 2015-12-05 17:45:32 +11:00
Marc Zinnschlag
2c5f0bf6c5 hide script error list when there are no errors (Fixes #2867) 
(cherry picked from commit 1093a53cf9)
 2015-12-05 17:45:16 +11:00
Marc Zinnschlag
0366a05649 Removed validator for filenames in OpenMW-CS (Fixes #2918) 
(cherry picked from commit b74b274ac0)
 2015-12-05 17:44:59 +11:00
Marc Zinnschlag
30b28bfd07 adjusted startup warning message for recent improvements regarding loading/saving 
(cherry picked from commit e0e9e7f8c2)
 2015-12-05 17:44:40 +11:00
cc9cii
19eed6f4c4 Fix warning C4458 (declaration of 'data' hides class member) 2015-11-22 19:23:11 +11:00
cc9cii
4290751010 Fix warning C4457 (declaration hides function parameter) 2015-11-22 19:17:10 +11:00
cc9cii
d70064efe4 Fix warning C4456 (declaration hides previous local declaration) 2015-11-22 19:15:06 +11:00
cc9cii
f68e423c33 Add missing Ogre headers. 2015-11-22 18:43:44 +11:00
cc9cii
9716b671f1 Merge branch 'cc9cii' into Feature-1278 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/nestedcoladapterimp.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/worldspacewidget.cpp
 2015-11-07 12:04:09 +11:00
cc9cii
f7598a67f4 Merge branch 'pathgrid-edit' into Feature-1278 
Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
 2015-11-07 11:56:34 +11:00
cc9cii
007c733578 Resolve merge issues and add back user preference setting for auto selecting a modified record. 
(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
 2015-11-07 07:17:46 +11:00
cc9cii
fb3015c9b8 Merge branch 'cc9cii' into jump-to-modified 
Conflicts:
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
	apps/opencs/view/world/tablesubview.cpp
 2015-11-07 06:30:46 +11:00
cc9cii
245357c9b2 Move TableEditModes enum inside a class scope. 
(cherry picked from commit 107ccd84d4)

Conflicts:
	apps/opencs/model/world/refidadapterimp.cpp
 2015-11-02 18:45:17 +11:00
cc9cii
0ec4af4210 Re-add mistakenly removed line and fix a silly typo. 
(cherry picked from commit 77471d1592)
 2015-11-02 06:25:46 +11:00
cc9cii
f08680ebcd Disable context menu for fixed size sub-tables. Should resolve bug #2932. 
(cherry picked from commit 80869d9bae)

Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/nestedtable.hpp
 2015-11-02 06:25:31 +11:00
cc9cii
b595f2641c Fix issue where mandatory effects field was allowed to be empty (and vice versa) 
(cherry picked from commit 972193c7eb)
 2015-11-01 23:09:06 +11:00
artemutin@yandex.ru
91c4afe78c Fixed filter reapplication on Description column change and on State 
column change.

Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.

(cherry picked from commit eae36f8005)
 2015-11-01 22:50:37 +11:00
artemutin@yandex.ru
437cabf778 If table dont use any filter, filter update now dont cause a reapply of empty filter 
(cherry picked from commit 33e12a99fa)
 2015-11-01 22:50:21 +11:00
artemutin@yandex.ru
f44d7e97b0 Stream error handling, and other minor changes. 
(cherry picked from commit 4ca7b26609)
 2015-11-01 22:49:05 +11:00
artemutin@yandex.ru
ba9190ed5e Implemented line and col calculations in scriptsubview 
(cherry picked from commit e7a3f059aa)
 2015-11-01 22:48:53 +11:00
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
artemutin@yandex.ru
c34d8c2a0d Add StartScriptCreator to a factory manager. 
(cherry picked from commit ecce3a1975)

Conflicts:
	apps/opencs/view/world/subviews.cpp
 2015-11-01 22:37:25 +11:00
artemutin@yandex.ru
7f46bc155a add getIdValidatorResult method to GenericCreator, for use in subclass 
StartScriptCreator

(cherry picked from commit 903cd3322b)
 2015-11-01 22:35:12 +11:00
artemutin@yandex.ru
b0018aa791 Fix namespace, add file to CMakeLists.txt 
(cherry picked from commit e672880f64)
 2015-11-01 22:34:49 +11:00
artemutin@yandex.ru
cb6198a843 Added StartScriptCreator class with redefined getErrors method. 
(cherry picked from commit 3f27c85630)
 2015-11-01 22:34:36 +11:00
Marc Zinnschlag
69e6328507 fixed local variable caching issue in automatic error checking (Fixes #2927) 
(cherry picked from commit 7bef97bf33)
 2015-11-01 21:36:14 +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
Marc Zinnschlag
6f294d0d25 removed some left-over signal slot stuff that shouldn't have been there in the first place 
(cherry picked from commit b3b4fb3efb)
 2015-11-01 21:35:09 +11:00
scrawl
fcb9068c19 Fix tab indentations in apps/ and components/ 
(cherry picked from commit a47617c21f)

Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwphysics/physicssystem.cpp
 2015-11-01 21:34:23 +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
ce34daa64b removed indirection in OpenMW-CS land record 
(cherry picked from commit 85f6bb892b)

Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-11-01 18:56:07 +11:00
cc9cii
4f24c6a7c8 more const-ness fixes 2015-11-01 17:07:40 +11:00
Marc Zinnschlag
44020df65f made return type of ESMTerrain::Storage::getLand const 
(cherry picked from commit febf611c82)
 2015-11-01 13:40:56 +11:00
Marc Zinnschlag
3eef192e4d create merged document and open a view for it (document is still empty at this point) 
(cherry picked from commit 1b663f01af)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/documentmanager.cpp
 2015-11-01 13:31:28 +11:00
Marc Zinnschlag
9423603e94 inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan) 
(cherry picked from commit e2377396a7)
 2015-11-01 13:25:46 +11:00
Marc Zinnschlag
e4381c3ec8 added merge operation (doesn't do anything yet) 
(cherry picked from commit 904ad94952)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-11-01 13:25:34 +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
68013bd324 Columns with Display_Boolean use Combobox editor even for non-boolean values 2015-09-08 06:46:21 +10:00