3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
7 years ago
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
11eae16645
Get rid of duplicate function, fix flag checking
7 years ago
30b05b557b
ExtraSpell magic effect: a basic implementation
7 years ago
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
7 years ago
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
7 years ago
ddf0dfed55
Merge pull request #298 from OpenMW/master
...
Add OpenMW commits up to 26 Sep 2017
7 years ago
19e07fad30
Remove redundant Services enum
7 years ago
82a211ba03
Fix duplicate code
7 years ago
f15de6d3ca
ESS-Importer: Convert magic projectiles ( Closes #2320 )
7 years ago
50d9d9f78f
Get rid of some templates, exceptions instead of assert, and other small changes.
7 years ago
09e645a0e0
Fix careless mistake.
7 years ago
25d4a0370f
Changes to land data access in tables, also update Land once per frame in scene view.
7 years ago
d030b595f8
Fix potential segfault, cleanup, get rid of warnings.
7 years ago
72cb405de2
Some bug fixes, changes to land load code.
7 years ago
ab607f3028
Tweaks to land loading, land cloning, terrain signals, placeholder land update handling
7 years ago
d3014cf394
Temporary fix for adding new lands, cloned lands will still reference old data though
7 years ago
7cc95a11a4
Add more land table columns
7 years ago
9e41f1340a
Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture
7 years ago
c8d965488f
Merge pull request #243 from OpenMW/master
...
Add OpenMW commits up to 18 Jul 2017
8 years ago
2bd105f5e2
Change mValue type for clothes to unsigned short ( fixes #3960 )
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
d48b829b45
replace and purge boost::lexical_cast
8 years ago
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
8 years ago
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
8 years ago
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
ff3e307059
Pass parameters by const reference
8 years ago
06acd3cbc4
[Client] Add a multiplayer object index and matching methods to CellRef
8 years ago
2a505b427d
Remove second LAND_SIZE definition
8 years ago
06dc94552f
Log a warning if size in SCHD (script header) does not match SCDT (bytecode) size instead of failing
8 years ago
b384087e28
Fix handling in fillVertexBuffers when the chunk is >1 ESM::Cell
8 years ago
0fc465da59
Store the min/max height in LandData
8 years ago
80a0398f9d
Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads
8 years ago
20d30bb8d7
Move mDataLoaded into LandData
8 years ago
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
8 years ago
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
8 years ago
e00b420f68
Move saving of LandData into Land::save
8 years ago
325bf66653
Return const Land in ESMStore
8 years ago
b4ef9e2314
Update loadbook.cpp
8 years ago
5a58ab1837
Update loadbook.hpp
8 years ago
bbcba57495
Disable hitAttemptActorId saving code for now
8 years ago
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
8 years ago
d3e1dbe920
Fix race conditions in terrain loader caused by static variables
8 years ago
5d2090684a
Store mHitAttemptActorId in save files
8 years ago
f0f78c9d64
Slight adjustments to disintegration fix
8 years ago
9624d8aade
Added new method and variable to track float remainders of disintegration effections
8 years ago
505250f6ec
Do not use architecture dependent type size_t in esm format ( Fixes #3633 )
8 years ago
f6ef1ce276
Fix Calm/Frenzy/Demoralize/Rally Creature weakness and resistance
8 years ago
David Cernat
Marc Zinnschlag
Kyle Cooley
Andrei Kortunov
scrawl
MiroslavR
Bret Curtis
Ewan Higgs
Allofich
scrawl
MAtahualpa
mrohrlach
Assumeru