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

753 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
cc9cii
4f24c6a7c8 more const-ness fixes 2015-11-01 17:07:40 +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
Stanislav Bas
29536751f5 Sort tables by ID in the ascending order initially 2015-09-08 06:45:45 +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
Marc Zinnschlag
c3a31d13b1 make non-editable fields in dialogue sub view selectable (Fixes #2818) 2015-09-08 06:16:22 +10:00
Stanislav Bas
c0d714adb6 Activate editing of nested table cells by a double click 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-09-08 05:49:39 +10:00
Stanislav Bas
7a927eec79 Close EditWidget when a proper row removed 2015-09-08 05:45:33 +10:00
cc9cii
b920e1bde7 Support MSVC 2015. Tested(*) with updated dependencies: 
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763

(*) only tested compilation and startup of the each app
 2015-08-12 06:50:22 +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
870bb491af Fix for issue #6 (https://github.com/cc9cii/openmw/issues/6) where dialogue subview for editing an NPC fails with an "invalid ID" exception. 
* NPC autocalc code was looking for non-existent values of race and class, this is now validated first.
* Also took the opportunity to grey out the spells table when auto-calculated. The template specialisation is a bit ugly, though.
 2015-07-31 09:05:26 +10:00
cc9cii
7e7c028530 Fix formatting issues after cherry-picking commit ab0b5932f7 2015-07-30 10:41:18 +10:00
Stanislav Bas
9a936046f6 Add edit locking to ExtendedCommandConfigurator 2015-07-30 09:33:28 +10:00
Stanislav Bas
6033e67b4a Close the extended configurator when all respective records were removed outside 2015-07-30 09:33:12 +10:00
Stanislav Bas
be1cf2fc80 ExtendedCommandConfigurator: layout changes 2015-07-30 09:31:48 +10:00
Stanislav Bas
194888e035 TableBottomBox: Creator/Configurator can be closed via Escape 2015-07-30 09:31:28 +10:00
Stanislav Bas
214a448ecf Fix build error 2015-07-30 09:30:50 +10:00
Stanislav Bas
977f317eb9 ExtendedCommandConfigurator: the perform button is now the default for the widget 2015-07-30 09:27:26 +10:00
Stanislav Bas
09d867c9bf ExtendedCommandConfigurator: the perform button takes the name of the command that is executed 2015-07-30 09:27:13 +10:00
Stanislav Bas
8eb677befb The configuration panel gets a focus when opening 2015-07-30 09:26:56 +10:00
Stanislav Bas
bf3891e16f ExtendedCommandConfigurator: disable the perform button when all tables are unchecked 2015-07-30 09:26:17 +10:00
Stanislav Bas
24eb9bddfb TableBottomBox adjusts its size according to the current widget size 2015-07-30 09:26:03 +10:00
Stanislav Bas
6c51e13917 Rework widget layout of ExtendedCommandConfigurator 2015-07-30 09:25:48 +10:00
Stanislav Bas
94725f32d9 Add the ability to configure extended commands for tables 2015-07-30 09:25:34 +10:00
Stanislav Bas
297373f436 Add the configuration widget to the bottom box 
Conflicts:
	apps/opencs/view/world/tablebottombox.cpp
 2015-07-30 09:24:28 +10:00
Stanislav Bas
b667500ae2 Add the configuration widget for extended commands 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-07-30 09:20:05 +10:00