mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 13:19:54 +00:00
Code Issues Releases Wiki Activity
14000 commits 38 branches 54 tags 122 MiB
Commit graph

2269 commits

Author SHA1 Message Date
Stanislav Bas
44c36a00f8 Add NAME and DELE handling to ESM records. 
Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case.

(cherry picked from commit 9ac20a3355)
 2015-12-05 06:58:34 +11:00
Stanislav Bas
e9a8eac6af Add NAME and DELE handling to ESM records. 
Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record.

(cherry picked from commit 926c825d0c)

Conflicts:
	components/esm/loadstat.cpp
	components/esm/loadstat.hpp
	components/esm/util.hpp
 2015-12-05 06:58:16 +11:00
Marc Zinnschlag
70cb6f0238 fixed an interference with script warning mode and error downgrading (Fixes #2990) 
(cherry picked from commit b61b732207)
 2015-12-05 06:40:10 +11:00
scrawl
368dd9bd8d Compiler: remove unused mNameStartingWithDigit 
(cherry picked from commit f7d0d06134)
 2015-12-05 06:34:32 +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
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
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
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
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
Marc Zinnschlag
25952369ae merge land tables 
(cherry picked from commit a8dc1c1198)
 2015-11-01 18:56:18 +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
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
35c4af9476 added copy constructor and assignment operator for Land record struct 
(cherry picked from commit b0641934d4)
 2015-11-01 13:40:32 +11:00
scrawl
05fd4e123e Use the format field instead of version field 
(cherry picked from commit a081d402c5)
 2015-10-25 11:35:32 +11:00
scrawl
b9ba1067bf Savegame loading optimization 
(cherry picked from commit 4637750601)
 2015-10-25 11:35:15 +11: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
Marc Zinnschlag
c157fef2e0 allow use of IDs as function arguments, even if the ID matches a keyword (Fixes #2830) 2015-09-08 06:01:47 +10:00
cc9cii
2242920b85 Fix compiling with MSVC 2013 (typo mistake with the include file). 2015-08-13 13:11:17 +10:00
cc9cii
bb250a236b Fix compilation when using 1.9 Ogre branch (i.e. the previous change on this file was in fact not related to MSVC 2015, but rather the use of the Ogre default branch). 2015-08-13 13:09:40 +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
da85b3a4ee Update to keeping config comments (Feature #2535) 
-An attempt to fix Coverity-Scan warning (see: https://github.com/OpenMW/openmw/pull/618#discussion_r33641670)
- Unable to test until a PR can be submitted.
 2015-08-01 13:25:35 +10:00
cc9cii
5bef43ac14 Remove duplicated config scanning (see: https://forum.openmw.org/viewtopic.php?f=7&t=2922&p=32940#p32940) 
* Requires boost::filesystem::canonical() from v1.48
* reduces startup time
* Fixes asset files being listed multiple times in tables
 2015-07-30 16:30:59 +10:00
cc9cii
7247da5a77 Fix loading openmw-template.omwgame with debug builds (see: https://forum.openmw.org/viewtopic.php?f=7&p=34026#p34026). Script::load() was failing with debug assertion fail (vector subscript out of range) 2015-07-30 15:48:45 +10:00
Marc Zinnschlag
26d617d88b allow keywords in quotes (Fixes #2794) 2015-07-30 09:34:46 +10:00
Koncord
386f545c67 Fix definition conflict 2015-07-27 15:22:19 +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
scrawl
502cc852da Handle encoding conversions when saving TES3 header (Fixes #2727) 2015-06-26 20:16:32 +02:00
cc9cii
273ff1cccb Address review comments. 2015-06-26 07:48:48 +10:00
cc9cii
b1f07ba4fb Resolve merge issues and change the getSpells() interface. 2015-06-25 18:57:32 +10:00
cc9cii
7af43a1155 Address review feedback. 2015-06-25 13:32:22 +10:00
cc9cii
91b9ad399f Include <cmath> for fmod() and floor() 2015-06-24 21:38:38 +10:00
cc9cii
8af12788a4 Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/util.cpp
 2015-06-24 21:16:48 +10:00
cc9cii
6b00d4ad91 Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS. 
- Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes
 2015-06-24 21:05:59 +10:00
scrawl
d3ef075952 Fix an uninitialized variable 2015-06-23 05:06:49 +02:00
scrawl
2ce269c0fc Werewolf stats compatibility with old save files 2015-06-21 18:45:49 +02:00
scrawl
d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves 
Still need to deal with save files.
 2015-06-21 17:28:18 +02: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
Marc Zinnschlag
8fc0bdfac7 Merge remote-tracking branch 'cc9cii/keep-config-comments' 2015-06-15 16:22:48 +02:00
cc9cii
6b28955f31 Fix attempt to erase using a const_iterator. 2015-06-15 10:26:16 +10:00
cc9cii
36aa4aa9bd If a removed 'content=' item has comments, keep them in config file for later use. 2015-06-15 09:53:26 +10:00
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +02:00
cc9cii
c22c9c271d Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535. 
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
 2015-06-14 14:51:01 +10:00
scrawl
28caeadef4 Improve error message for not found records 2015-06-14 02:31:00 +02:00
scrawl
de98d991b4 Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535." 
Breaks the saving of content= entry order.

This reverts commit 15fe5d88e2.

Conflicts:
	components/config/gamesettings.cpp
 2015-06-13 23:50:12 +02:00
scrawl
c54a225467 Revert "Allow space characters in front of comments." 
This reverts commit 4902c66792.
 2015-06-13 23:49:29 +02:00