mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00
Code Issues Projects Releases Wiki Activity
13,918 Commits 19 Branches 66 Tags
Commit Graph

13918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emmanuel Anne
890405bdb1 scripts: recognize '+' also as a unary operator 
it fixes the armor sorter in "Blades safe house.esp"

(cherry picked from commit dace7ab7060c47155d70170a091b465c8b3b2688)
 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 7bef97bf3331dbdf9544c2caad17ecf68b3be96b)
 2015-11-01 21:36:14 +11:00
Marc Zinnschlag
14708e181c more cleanup 
(cherry picked from commit 659b87b25faec71089ae5f8b96b4283d58abaab7)

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 b3b4fb3efbaf84a31b9a62203f9767b08328b671)
 2015-11-01 21:35:09 +11:00
Marc Zinnschlag
46c6092e99 updated credits file 
(cherry picked from commit 56163dcb2a33fdf67bd78dc63a6134c4f408505a)
 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 ab97a90c760fb3a558f25bd49527bf69fbba8d64)
 2015-11-01 21:34:36 +11:00
scrawl
fcb9068c19 Fix tab indentations in apps/ and components/ 
(cherry picked from commit a47617c21f11c33e10b8a635292c3b1a4d8d5769)

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 4d94f38f4b7255fd1abbcdc8d2bd388e604bec04)
 2015-11-01 21:33:37 +11:00
cc9cii
ae1439f223 Fix typo. 
(cherry picked from commit 1365b8edd1f0a20e97ccb9a30cd74a6dc97c44bd)
 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 192f01e3ac5db4f0d1d9d78c2a419b274f307bb1)
 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 45aee1b5088cb110e06540356670b806887f7372)

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 5a5e1a3b22e21d8fb847f4ab04497c2d4fdaf4c5)

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 c4a900ca2c9b98267c9a507bb887829373fc9193)

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 258b2ba29abedf329db1db2c5660cf213445c999)
 2015-11-01 20:14:11 +11:00
scrawl
7c347a5908 CONTRIBUTING.md: clarify "if applicable" 
(cherry picked from commit 5fde9149594f6503c192f9d949d8f0bb3f3df5ba)
 2015-11-01 19:09:21 +11:00
scrawl
c40e68cc5b Add CONTRIBUTING.md 
(cherry picked from commit 6c6fc662ef80b5c99fc2b3723faa410edb37868c)
 2015-11-01 19:09:08 +11:00
scrawl
c0f21bfb77 Add some comments to ESM::Land 
(cherry picked from commit 5252dbcf1f4dc311419ca9f7d5f32a765771d1e0)

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 b68f64ed97aff7c48d6878241ecd64d6acaba2f5)
 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 5be176ee85da349163e161f86693f836fb1b5fdc)
 2015-11-01 18:57:18 +11:00
Marc Zinnschlag
453c3ee760 fixed an indexing error 
(cherry picked from commit 23fde87816644912c9896920b80348429a045003)
 2015-11-01 18:57:07 +11:00
Marc Zinnschlag
4aa6d7d1d1 various minor fixes 
(cherry picked from commit 584a7a66b97739c91c38cf8f17922ba29d5536e2)
 2015-11-01 18:56:56 +11:00
Marc Zinnschlag
dcf1f1515a handle missing land texture records properly during merge 
(cherry picked from commit 09ec60fe2a7b2cce91ee5f2271db4479b97ae228)
 2015-11-01 18:56:43 +11:00
Marc Zinnschlag
1784701b47 fixed a texture indexing bug (only affects the editor) 
(cherry picked from commit 73f6efddcc1b6f5816f9f775418c6317cf74ee20)
 2015-11-01 18:56:31 +11:00
Marc Zinnschlag
25952369ae merge land tables 
(cherry picked from commit a8dc1c119859abd0ad4cf16765abbf1f70fe6013)
 2015-11-01 18:56:18 +11:00
Marc Zinnschlag
ce34daa64b removed indirection in OpenMW-CS land record 
(cherry picked from commit 85f6bb892b7f61b95d297efcf67cfccaee134e54)

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 69b9eadb52cf24398d64b6399341d9e6b5d40bdf)

Conflicts:
	apps/openmw/mwworld/scene.cpp
	components/esmterrain/storage.cpp
 2015-11-01 18:54:15 +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 febf611c827a257a4d4000b601f9ef413f2f8012)
 2015-11-01 13:40:56 +11:00
Marc Zinnschlag
8cb1f4ffe9 additional safety check for land texture listing merge stage 
(cherry picked from commit 69045d7ec9d293f2bb5626b2ac4a8517a0cf67e4)
 2015-11-01 13:40:45 +11:00
Marc Zinnschlag
35c4af9476 added copy constructor and assignment operator for Land record struct 
(cherry picked from commit b0641934d4a34b4e462932aa715cc0ca9d854cae)
 2015-11-01 13:40:32 +11:00
Marc Zinnschlag
a2d4957d2a merge land texture tables 
(cherry picked from commit 890bbb6b119bab1b9a7b5724ab3e6a769ede761a)
 2015-11-01 13:40:21 +11:00
Marc Zinnschlag
e5038cbece fixed merge stage order; added proper initialisation 
(cherry picked from commit b7983d08ba3f238f0cddad467049c87b17a3745f)
 2015-11-01 13:40:07 +11:00
Marc Zinnschlag
73ab89bf70 merge references tables 
(cherry picked from commit a97a632aa76c3b7499ae170b689676d2f32b8550)
 2015-11-01 13:39:56 +11:00
Marc Zinnschlag
62daecadf5 fixed record state issues after merge 
(cherry picked from commit 845cafd61c12142a353119a6304845370037d7a5)
 2015-11-01 13:39:44 +11:00
Marc Zinnschlag
9230c62884 merge referenceables table 
(cherry picked from commit f95950e8d815997da34eb9939b81cd27afb62dbb)
 2015-11-01 13:39:30 +11:00
Marc Zinnschlag
81188a3456 silenced a warning 
(cherry picked from commit 9cf793c0b519143fd7d3ac3cfb7beb82f65b72f3)

Conflicts:
	apps/opencs/model/doc/document.cpp
 2015-11-01 13:39:18 +11:00
Marc Zinnschlag
72aa998261 simplifying merge stage 
(cherry picked from commit 40753aa9a3759e247b1fc907f5ef61af2656d533)
 2015-11-01 13:37:41 +11:00
Marc Zinnschlag
e33314ad81 made merge operation more fluent 
(cherry picked from commit 16dda281cee3fb1bab7276cc21448b754d5db3c5)
 2015-11-01 13:37:26 +11:00
Marc Zinnschlag
98cac624a9 added info tables and pathgrid table to merge operation 
(cherry picked from commit 103073150e87d62582649ea6943fdc510eb5ca59)
 2015-11-01 13:37:14 +11:00
Marc Zinnschlag
024a5405e0 flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first) 
(cherry picked from commit c92898a5bc18584708bd9c0e1e76c517adb3499b)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-11-01 13:37:01 +11:00
Marc Zinnschlag
973c65bc82 merge id collections 
(cherry picked from commit 3902513e65206908c0f0f54db213a7c9ea7f2fd0)
 2015-11-01 13:35:15 +11:00
Marc Zinnschlag
55dfe48ef7 copy meta data from game file when merging 
(cherry picked from commit 47dd9505a9464dc5c947f409c3c4a80cf4d8e395)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/data.cpp
 2015-11-01 13:34:41 +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 1b663f01aff94811a46825467cad8f38ed025b24)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/documentmanager.cpp
 2015-11-01 13:31:28 +11:00
Marc Zinnschlag
0b8e04d6a8 forgot to connect merge operation signals 
(cherry picked from commit d8655f2ff862dbaf90fb285ef01cdf6891cdbea6)
 2015-11-01 13:25:59 +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 e2377396a7cf7b9cd1ec91e0f385721a124a49cc)
 2015-11-01 13:25:46 +11:00
Marc Zinnschlag
e4381c3ec8 added merge operation (doesn't do anything yet) 
(cherry picked from commit 904ad949524864239f4b1f428d03a947360728a0)

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 708cacdec403793a0337c6e536a1ecf53a58bd6e)
 2015-11-01 13:23:09 +11:00
Marc Zinnschlag
a5a0990d3c improved adjuster widget problem reporting 
(cherry picked from commit 4fd3097c1cf2329cef071aee7a1b149e280e4974)
 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 b83f9445a96fda4dc14e43a2db363a748344227f)

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 6a9218ee07a81c9ca56faf8661c9d38e84ba3028)
 2015-11-01 13:19:56 +11:00