b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
9 years ago
b98a076055
Add documentation for ACTN ess-record (activation flags)
9 years ago
54fa5273dc
Refactor weather transitions to act more like MW
...
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
9 years ago
af3b0cd883
Improve some error messages
9 years ago
0c6ab6cc94
Load methods (for ESM records) accept a deleted flag in ESSImporter
10 years ago
6b21da7f8e
Rework ESS importer code. Remove explicit NAME handling for ESM records
10 years ago
0ed3e3e489
Fix cout/cerr mixup
10 years ago
24ae1d5ace
Fix some issues found by coverity
10 years ago
3655ef16af
Explicitly instantiate ESM::StatState
10 years ago
2065e0fa2d
Use the correct format specifier for ess-imported savegames
10 years ago
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
10 years ago
3f54f77647
essimporter build fix
10 years ago
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
364b785e8f
ESSImporter image conversions port to osg::Image
10 years ago
e197f5318b
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
10 years ago
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
0e88fb3dca
ESSImport: read AiPackages
10 years ago
a1ee26922e
ESSImport: note location of corpse clear countdown
10 years ago
55cd9b526c
Skill progress bar changed to match MW
10 years ago
f0b1d889c0
ESSImport: import player skill progress
10 years ago
356d1c7657
ESSImport: convert stolen item tracker
10 years ago
6d097fbfbd
Normalise spelling of "levelled" throughout the code
10 years ago
51c05264b0
ESSImport: note where skill progress is stored (not converted yet)
10 years ago
c4038f7021
ESSImport: convert camera first/third person state
10 years ago
f3c79c0aa0
ESSImport: convert player DrawState, cleanup
10 years ago
2e4b5858e7
ESSImport: add ANSI color code highlighting for --compare switch
10 years ago
ef3ba12cb6
Add silent mode to ConfigurationManager, used by essimporter
10 years ago
e7056b4e27
ESSImport: convert Dead flag
10 years ago
7e3843de42
ESSImport: convert Attacked flag
10 years ago
081c8c8615
ESSImport: convert to utf8, based on encoding setting in openmw.cfg
10 years ago
201674cd70
ESSImport: convert world map overlay ( Fixes #2313 )
10 years ago
6c08e05fc3
ESSImport: fix for GMDT being only 92 bytes in a certain save file
10 years ago
431f540791
ESSImport: fix NPC factions
10 years ago
875df46ae9
ESSImport: convert journal indices
10 years ago
f35c9b7a69
Clang warning fixes (thanks hemite)
10 years ago
76820e700c
ESSImport: reading used powers fix (not used, see comment)
10 years ago
315f9a98ad
ESSImport: document targeted scripts (not implemented yet)
10 years ago
d34086ac8f
ESSImport: convert running global scripts
10 years ago
9b3728d878
ESSImport: convert weather state
10 years ago
70e4f821ba
Fix Windows warning
...
warning C4244: 'initializing' : conversion from 'float' to 'int', possible loss of data
10 years ago
946dd16696
Fixed Windows warning.
...
warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
10 years ago
e02bab67ba
Fixed MSVC warnings.
...
warning C4099: 'ESM::ESMReader' : type name first seen using 'class' now seen using 'struct'
warning C4099: 'ESM::CellId' : type name first seen using 'struct' now seen using 'class'
10 years ago
b0b275a936
Fix for MSVC 2013 compiler issues.
...
Fixes: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\utility(199): error C2079: 'std::pair<const _Kty,_Ty>::second' uses undefined class 'boost::shared_ptr<ESSImport::Converter>'
Which cascades to 36 more errors.
10 years ago
b1bd236345
ESSImport: convert script local variables
...
Had to add special reading code to openmw, because the variable names are not stored.
10 years ago
09f11fbff2
ESSImport: convert selected spell / selected enchant item
10 years ago
bf90b86f73
ESSImport: add some missing subrecords
10 years ago
79d2eebe54
Store selected enchant item in savegame ( Fixes #1702 )
10 years ago
e484a91708
ESSImport: convert global map markers
10 years ago
scrawl
slothlife
Stanislav Bas
Alexander "Ace" Olofsson
dteviot