cc9cii
15d5cdf3cf
Allow TES4 ESM/ESP to co-exist with TES3 ESM/ESP.
...
This change aims to allow TES4/TE5 content to OpenMW. i.e. a standalone TES4 would be implemented quite differently. That said, the key changes are:
* Use pointers rather than references for ESM readers so that they can be switched to another variant on the fly.
* Content file dependencies to be checked within each group (only 3 groups for now, TES3/TES4/TES5)
2018-10-06 20:38:53 +10:00
cc9cii
4cd4cf8479
Resolved conflicts and build fixes.
2018-10-05 21:54:29 +10:00
scrawl
f456174af8
Rename to lowerCaseInPlace
...
(cherry picked from commit 07b064f616
)
# Conflicts:
# apps/opencs/model/world/commanddispatcher.cpp
# apps/opencs/model/world/regionmap.cpp
# apps/opencs/model/world/scriptcontext.cpp
# apps/openmw/mwrender/animation.cpp
# apps/openmw/mwscript/statsextensions.cpp
# apps/openmw/mwworld/store.cpp
# components/misc/stringops.hpp
2018-10-05 19:16:46 +10:00
scrawl
98ea184dda
Do not assert() for invalid land data in plugins (Bug #3037 )
...
The resizing of LTEX store to the correct number of plugins was done in the load() method, but the load method won't be called if a plugin contains LAND records but doesn't contain LTEX records. For such plugins the Store<ESM::LandTexture>::search() function would then fail an assertion.
(cherry picked from commit 4687c4baad
)
# Conflicts:
# apps/openmw/mwworld/store.cpp
# apps/openmw/mwworld/store.hpp
2018-10-05 19:02:48 +10:00
scrawl
b4cdb965dc
Move rng to components
...
(cherry picked from commit 8c810e3620
)
# Conflicts:
# apps/openmw/engine.cpp
# apps/openmw/mwclass/npc.cpp
# components/misc/rng.cpp
# components/sceneutil/lightcontroller.cpp
# libs/openengine/CMakeLists.txt
2018-10-05 18:53:47 +10:00
Stanislav Bas
0c002dd6de
Load/read methods (for ESM records) accept a deleted flag in OpenMW
...
(cherry picked from commit 67c8f95c4e
)
Conflicts:
apps/openmw/mwworld/store.cpp
2015-12-05 11:20:55 +11:00
Stanislav Bas
3686c1e32d
Move DELE handling to CellRef record
...
(cherry picked from commit e8a9567be3
)
2015-12-05 07:20:09 +11:00
Stanislav Bas
377d606fc3
Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)
...
(cherry picked from commit c266315a35
)
Conflicts:
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/store.hpp
2015-12-05 07:17:56 +11:00
Stanislav Bas
25a8cda9ac
Some fixes for ESM Dialogues and Infos
...
(cherry picked from commit e0983c815c
)
2015-12-05 07:09:05 +11:00
Stanislav Bas
19acd1fada
Letter case fix for MWWorld::Globals
...
(cherry picked from commit 20723581a1
)
2015-12-05 07:08:30 +11:00
Stanislav Bas
a46ea70d65
Convert IDs of loaded records to lower case in MWWorld::Store
...
(cherry picked from commit 00bf87b561
)
2015-12-05 07:08:17 +11:00
Stanislav Bas
f8b0cfc637
Remove NAME handling from MWWorld::Globals
...
(cherry picked from commit 897a52cdda
)
2015-12-05 07:08:00 +11:00
Stanislav Bas
2564eb9841
Remove NAME handling from MWWorld::ESMStore
...
(cherry picked from commit 9301bc148e
)
2015-12-05 07:07:43 +11:00
Stanislav Bas
e0d5208d26
Remove explicit record ID in load/read methods of MWWorld::Store
...
(cherry picked from commit 89e44c8f1f
)
2015-12-05 07:07:14 +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
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
cc9cii
4f24c6a7c8
more const-ness fixes
2015-11-01 17:07:40 +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
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
58923591cb
Remove extra qualification.
2015-06-25 19:25:47 +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
0cf9832017
Add missing files for autocalc. Remove c++11 dependency.
2015-06-24 21:58:28 +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
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
scrawl
28caeadef4
Improve error message for not found records
2015-06-14 02:31:00 +02:00
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
scrawl
7f2dd21c66
Fix for StartScript regression ( Fixes #2590 )
2015-05-30 17:20:49 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
Marc Zinnschlag
b6878c2e0c
improved error handling in LocalScripts::add
2015-05-27 19:45:26 +02:00
scrawl
d1b6289cad
Don't teleport followers when using teleportation spells
2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
8bcfac1ea3
Fix adjustPosition not always working correctly ( Fixes #2563 )
...
moveObject was returning an incorrect Ptr for cell movements.
2015-05-17 18:16:42 +02:00
scrawl
97c35da441
Change exterior water level to z=-1 ( Fixes #1405 )
2015-05-11 16:38:16 +02:00
scrawl
eef8f71797
Add a comment
2015-05-11 16:38:16 +02:00
scrawl
b312f50b1f
Fix regression with detect spells detecting deleted objects ( Fixes #2518 )
2015-05-11 16:38:15 +02:00
k1ll
a230050ec8
Boost tr1 unordered map does not work with mingw
2015-04-29 18:31:29 +02:00
dteviot
0a5de33a1a
fireEquipmentChangedEvent() updates the InventoryWindow. ( Fixes #2424 )
2015-04-06 15:13:09 +12:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
cc9cii
4d46d7ba72
Fix some compiler warnings.
2015-03-14 06:07:12 +11:00
Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
2015-03-13 17:33:08 +01:00
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
2015-03-12 10:29:39 +01:00
scrawl
3879ce6ac1
Get rid of "player" string checks ( Fixes #2216 )
2015-03-11 23:07:39 +01:00
scrawl
48ea6286fd
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76
WindowManager refactoring
2015-03-11 20:04:25 +01:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
dteviot
ca8c8c6aa4
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 17:42:07 +13:00