mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 14:56:38 +00:00
Code Issues Releases Wiki Activity
13942 commits 115 branches 76 tags 128 MiB
Commit graph

13942 commits

This branch
This branch
All branches
Author SHA1 Message Date
cc9cii
a19a1dabe2 Add a check for scale value of 0. Should resolve bug #2880. 
(cherry picked from commit 819fecd08e)
 2015-11-02 18:46:34 +11:00
cc9cii
26195dc5fe Rename a variable to make it less confusing. 
(cherry picked from commit 7c007d9c6d)
 2015-11-02 18:46:21 +11:00
cc9cii
894f3a9418 Fix saving when only topic info was modified (topic itself unchanged) 
(cherry picked from commit 78c735adc6)
 2015-11-02 18:46:04 +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
cc9cii
bb1a959c88 Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980. 
(cherry picked from commit 1a64b40725)
 2015-11-01 23:08:55 +11:00
cc9cii
30de5c1c59 Fix editing ingredient effects sub-table. Should resolve bug #2978. 
(cherry picked from commit 9f0e059a15)
 2015-11-01 23:08:42 +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
Marc Zinnschlag
aa31704d5d deal with script execution from within a script (Fixes #2964) 
(cherry picked from commit 8eb6d337d5)
 2015-11-01 22:48:38 +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
b3daa7d956 Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930. 
(cherry picked from commit 3bbcf6a916)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
 2015-11-01 22:47:47 +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
8fffbb3f9b updated credits file 
(cherry picked from commit 64902bf221)
 2015-11-01 22:37:58 +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
4677560859 adjusted a workaround for names starting with digits that interfered with some numerical expressions written without spaces 
(cherry picked from commit 435e52306a)
 2015-11-01 21:37:30 +11:00
Marc Zinnschlag
c5235ea794 removed a redundant else and made unary + work also in the console 
(cherry picked from commit ae54f34f25)
 2015-11-01 21:37:14 +11:00
Emmanuel Anne
890405bdb1 scripts: recognize '+' also as a unary operator 
it fixes the armor sorter in "Blades safe house.esp"

(cherry picked from commit dace7ab706)
 2015-11-01 21:37:01 +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
Marc Zinnschlag
46c6092e99 updated credits file 
(cherry picked from commit 56163dcb2a)
 2015-11-01 21:34:56 +11:00
scrawl
9179782002 Add travis-ci script to detect tab characters in the code 
(cherry picked from commit ab97a90c76)
 2015-11-01 21:34:36 +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
Marc Zinnschlag
a2294117cd replaced context-sensitive implementation of allowing digits at the beginning of names with a more general implementation (Fixes #1730) 
(cherry picked from commit 4d94f38f4b)
 2015-11-01 21:33:37 +11:00
cc9cii
ae1439f223 Fix typo. 
(cherry picked from commit 1365b8edd1)
 2015-11-01 21:33:12 +11:00
cc9cii
148ccb79e8 Set default creature scale to 1. Partially resolves bug #2880. (no creature verifier yet) 
(cherry picked from commit 192f01e3ac)
 2015-11-01 21:32:57 +11:00
cc9cii
2f76a1510e Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879. 
(cherry picked from commit 45aee1b508)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp
 2015-11-01 21:32:34 +11:00
cc9cii
f7eb502493 Add missing fields for editing creatures. 
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)

(cherry picked from commit 5a5e1a3b22)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
 2015-11-01 20:36:24 +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
cc9cii
496cdcb51b Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique. 
(cherry picked from commit 258b2ba29a)
 2015-11-01 20:14:11 +11:00
scrawl
7c347a5908 CONTRIBUTING.md: clarify "if applicable" 
(cherry picked from commit 5fde914959)
 2015-11-01 19:09:21 +11:00
scrawl
c40e68cc5b Add CONTRIBUTING.md 
(cherry picked from commit 6c6fc662ef)
 2015-11-01 19:09:08 +11:00
scrawl
c0f21bfb77 Add some comments to ESM::Land 
(cherry picked from commit 5252dbcf1f)

Conflicts:
	components/esm/loadland.hpp
 2015-11-01 19:08:52 +11:00
Sebastian Wick
03ee1ec8cb adjust FindMyGUI.cmake to correctly handle REQUIRED and QUIETLY 
(cherry picked from commit b68f64ed97)
 2015-11-01 18:57:38 +11:00
Marc Zinnschlag
5031d1fbcb disable on-demand loading of land data (for now, maybe) 
(cherry picked from commit 5be176ee85)
 2015-11-01 18:57:18 +11:00
Marc Zinnschlag
453c3ee760 fixed an indexing error 
(cherry picked from commit 23fde87816)
 2015-11-01 18:57:07 +11:00
Marc Zinnschlag
4aa6d7d1d1 various minor fixes 
(cherry picked from commit 584a7a66b9)
 2015-11-01 18:56:56 +11:00
Marc Zinnschlag
dcf1f1515a handle missing land texture records properly during merge 
(cherry picked from commit 09ec60fe2a)
 2015-11-01 18:56:43 +11:00
Marc Zinnschlag
1784701b47 fixed a texture indexing bug (only affects the editor) 
(cherry picked from commit 73f6efddcc)
 2015-11-01 18:56:31 +11:00
Marc Zinnschlag
25952369ae merge land tables 
(cherry picked from commit a8dc1c1198)
 2015-11-01 18:56:18 +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
Marc Zinnschlag
c4b34a077e refactored loading of land data 
(cherry picked from commit 69b9eadb52)

Conflicts:
	apps/openmw/mwworld/scene.cpp
	components/esmterrain/storage.cpp
 2015-11-01 18:54:15 +11:00