Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
8 years ago
David Cernat
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
Allofich
ff3e307059
Pass parameters by const reference
8 years ago
David Cernat
06acd3cbc4
[Client] Add a multiplayer object index and matching methods to CellRef
8 years ago
Allofich
2a505b427d
Remove second LAND_SIZE definition
8 years ago
MiroslavR
06dc94552f
Log a warning if size in SCHD (script header) does not match SCDT (bytecode) size instead of failing
8 years ago
scrawl
b384087e28
Fix handling in fillVertexBuffers when the chunk is >1 ESM::Cell
8 years ago
scrawl
0fc465da59
Store the min/max height in LandData
8 years ago
scrawl
80a0398f9d
Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads
8 years ago
scrawl
20d30bb8d7
Move mDataLoaded into LandData
8 years ago
scrawl
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
scrawl
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
8 years ago
scrawl
e00b420f68
Move saving of LandData into Land::save
8 years ago
scrawl
325bf66653
Return const Land in ESMStore
8 years ago
MAtahualpa
b4ef9e2314
Update loadbook.cpp
8 years ago
MAtahualpa
5a58ab1837
Update loadbook.hpp
8 years ago
scrawl
bbcba57495
Disable hitAttemptActorId saving code for now
8 years ago
scrawl
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
8 years ago
scrawl
d3e1dbe920
Fix race conditions in terrain loader caused by static variables
8 years ago
Allofich
5d2090684a
Store mHitAttemptActorId in save files
8 years ago
mrohrlach
f0f78c9d64
Slight adjustments to disintegration fix
8 years ago
mrohrlach
9624d8aade
Added new method and variable to track float remainders of disintegration effections
8 years ago
scrawl
505250f6ec
Do not use architecture dependent type size_t in esm format ( Fixes #3633 )
8 years ago
Assumeru
f6ef1ce276
Fix Calm/Frenzy/Demoralize/Rally Creature weakness and resistance
8 years ago
MiroslavR
301dd77efb
Save controls state ( Fixes #3598 )
8 years ago
Allofich
f6f16b68de
Don't let Weakness to Magicka affect paralysis
8 years ago
Allofich
498976775a
Fix reversed use of alembics and retorts
8 years ago
MiroslavR
55e670c5fe
Fix animation state not saving
...
References with animation state changed but otherwise identical to their content file counterparts
were previously considered unchanged and thus dropped while saving.
8 years ago
scrawl
a5da3a269e
Fix shadowing warnings
8 years ago
MiroslavR
b65f379b7f
Save scripted animation state ( Fixes #1931 , #2150 , #3393 )
9 years ago
MiroslavR
d790747389
Implement deletion of moved references (Bug #3471 )
9 years ago
scrawl
b9b73d7b12
Replace "sys::default" with ESM::CellId::sDefaultWorldspace
9 years ago
MiroslavR
54f52f7bae
Implement effect removal for abilities ( Fixes #3455 )
9 years ago
MiroslavR
b99611a730
Initialize mSpecIncreases in ESM::NpcStats::load
9 years ago
MiroslavR
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
9 years ago
scrawl
372f2e2f18
Merge pull request #962 from Allofich/AIPackageFixes
...
Duration fixes for Follow and Escort
9 years ago
Allofich
3bebbab78e
Duration fixes for Follow and Escort
9 years ago
scrawl
197e81206a
Assume mDeathAnimationFinished is true for older save files
9 years ago
scrawl
a825882c6b
Process death events at the end of the death animation ( Fixes #1873 )
9 years ago
Allofich
55ac1fab68
Change Wander duration to run on a counter
9 years ago
Marc Zinnschlag
b079db7913
Merge remote-tracking branch 'aesylwinn/EditPathgrid'
9 years ago
Aesylwinn
564d0db68c
Move pathgrid abstraction handling to save code.
9 years ago
scrawl
3749821809
Choose a random death animation for actors that start the game as dead ( Fixes #3397 )
9 years ago
scrawl
04b537bf5f
Minor cleanup
9 years ago
scrawl
85b0c4393b
Remove obsolete code
9 years ago
scrawl
6e0c3b2413
Revert commit 16ac6e7aac
( Fixes #3394 )
9 years ago
scrawl
a7e6219091
Merge pull request #939 from kpp/rewrite_esm_name_t
...
Rewrite ESM::NAME_T
9 years ago
Roman Proskuryakov
d5dfa89060
Rewrite NAME_T into FIXED_STRING.
9 years ago
Roman Proskuryakov
1e7d573f24
Fix uninitialized values in ESMWriter::save
9 years ago
scrawl
121bdd3e39
Update comment
9 years ago
scrawl
3e6cf17665
Warn about cellrefs with an empty refId (Bug #3238 )
9 years ago
scrawl
3d6323f13a
Force-enable hasWater() for exterior cells ( Fixes #3222 )
9 years ago
scrawl
2821f46a18
Corpse clearing fix
9 years ago
scrawl
27577ce765
Add ESM::Land::DEFAULT_HEIGHT
9 years ago
scrawl
c3ef387208
Vanilla-compatible creature/NPC respawning ( Fixes #2369 , Fixes #2467 )
9 years ago
scrawl
f99cd15f00
Vanilla-compatible activate / onActivate ( Fixes #1629 )
...
See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
9 years ago
scrawl
90a99991d1
Use empty() instead of !size()
9 years ago
scrawl
596fe56bfd
Make Land::loadData thread safe
9 years ago
Tobias Kortkamp
0659687bfb
Some fixes for building on FreeBSD
9 years ago
scrawl
57b7cac13f
Merge pull request #850 from MatthewRock/fix-2952-2
...
Fix for bug #2952 : Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
9 years ago
MatthewRock
3b254ad631
Allows the same item to have multiple ancestors
9 years ago
scrawl
bdae572264
Merge pull request #840 from scrawl/movedrefs
...
Object movement between cells
9 years ago
MatthewRock
aa721fe1f6
Fix bug 2952 with merchant and levelled items
9 years ago
scrawl
e4751c68e9
Typo fix
9 years ago
scrawl
671561ea37
Write moved references to the save game file (not resolved on loading yet)
9 years ago
scrawl
fbee32729a
Cache CellId
...
ESM::Cell::getCellId() was allocating a string on every call. This caused functions dealing with cellIds to be unnecessarily expensive.
For example, World::moveObject spent almost as much time comparing CellIds as it did updating Bullet's AABB after the move. OpGetDistance was by far the most expensive script instruction because it has to compare cellIds.
The total cost of getCellId() relative to the frame loop was about 0.3%.
9 years ago
scrawl
0bdfd1b0d7
Ignore Creature INDX subrecords
...
Found in some .ess files, not sure what they mean.
9 years ago
scrawl
fc8e40889d
Move common subrecord definitions (NAME, DELE) to defs.hpp
9 years ago
scrawl
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
scrawl
b4ce73f179
Rotations: remove LocalRotation
...
This never existed in vanilla MW in the first place. The reason we got confused was because of a strange behaviour where the order of applying rotations changes as soon as a script touches the object's rotation.
9 years ago
MatthewRock
a662a00c62
Fixing bug for merchant
9 years ago
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
9 years ago
cc9cii
192f01e3ac
Set default creature scale to 1. Partially resolves bug #2880 . (no creature verifier yet)
9 years ago
cc9cii
45aee1b508
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
9 years ago
scrawl
5252dbcf1f
Add some comments to ESM::Land
9 years ago
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
9 years ago
Marc Zinnschlag
a8dc1c1198
merge land tables
9 years ago
Marc Zinnschlag
69b9eadb52
refactored loading of land data
9 years ago
Marc Zinnschlag
b0641934d4
added copy constructor and assignment operator for Land record struct
9 years ago
slothlife
7817c52cbb
Discard old save game weather records
9 years ago
slothlife
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
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
Stanislav Bas
f9b0b7ede5
Make saving of deleted ESM records more consistent
10 years ago
Stanislav Bas
9a8ca81907
Fix missing break in switch statement
10 years ago
Stanislav Bas
daaff1284e
Remove unused includes
10 years ago
Stanislav Bas
4a16eba716
Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records
10 years ago
Stanislav Bas
1e8182220a
Fix build errors & warnings
10 years ago
Stanislav Bas
f5745749a6
Remove <cstdint> include file from loaddial.cpp
10 years ago
Stanislav Bas
5fd48efd28
Some refactoring. Remove unused code
10 years ago
Stanislav Bas
e65ff723ce
More ESM records have DELE handling.
...
Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter
10 years ago
Stanislav Bas
ad353e6dd0
Refine DELE handling in ESM records. Add position-independent DELE search
10 years ago
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
10 years ago
Stanislav Bas
e8a9567be3
Move DELE handling to CellRef record
10 years ago
Stanislav Bas
b55a4999ca
Add NAME handling to DebugProfile and Filter records
10 years ago
Stanislav Bas
c8c79dc1ef
Move ID loading into a separate method for Dialogue and DialInfo records
10 years ago
Stanislav Bas
74a055f3cc
Remove NAME and DELE handling from IdCollection
10 years ago
Stanislav Bas
c266315a35
Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)
10 years ago
Stanislav Bas
2ed182b144
Update to upstream/master. Resolve merge conflicts in MWWorld::Store
10 years ago
Stanislav Bas
adec0cb61d
Add removing of deleted Infos to Dialogue::clearDeletedInfos()
10 years ago
Stanislav Bas
e0983c815c
Some fixes for ESM Dialogues and Infos
10 years ago
Stanislav Bas
7ecb54a776
Set Deleted flag to false when initializing ESM records
10 years ago
Stanislav Bas
89e44c8f1f
Remove explicit record ID in load/read methods of MWWorld::Store
10 years ago
Stanislav Bas
b2f3ccb080
Add NAME handling to GameSetting record
10 years ago
Stanislav Bas
09a3358017
Add NAME and DELE handling to Global record
10 years ago
Stanislav Bas
30b42bf4c0
Remove redundant code
10 years ago
Stanislav Bas
8c3654af11
Add NAME handling to Race record
10 years ago
Stanislav Bas
b667338a8f
Add NAME and DELE handling to Cell record
10 years ago
Stanislav Bas
847614c26f
Add DELE handling to Info record
10 years ago
Stanislav Bas
0b537186e5
Add NAME and DELE handling to Dialogue record
10 years ago
Stanislav Bas
19ac4e942a
Change DELE sub-record value to 0 (4 bytes)
10 years ago
Stanislav Bas
d2c15647a3
Add NAME and DELE handling to Script record
10 years ago
Stanislav Bas
9ac20a3355
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.
10 years ago
Stanislav Bas
926c825d0c
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.
10 years ago
Alexander "Ace" Olofsson
2bebfea38d
Instantiate struct as a struct
10 years ago
Alexander "Ace" Olofsson
3655ef16af
Explicitly instantiate ESM::StatState
10 years ago
scrawl
a1432b0255
Move attackingOrSpell flag to the CharacterController
10 years ago
scrawl
a081d402c5
Use the format field instead of version field
10 years ago
scrawl
4637750601
Savegame loading optimization
10 years ago
scrawl
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
scrawl
502cc852da
Handle encoding conversions when saving TES3 header ( Fixes #2727 )
10 years ago
scrawl
882e359008
Move attackStrength to the CharacterController, where it should have been to begin with
...
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
10 years ago
scrawl
5bc6513e2d
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
10 years ago
scrawl
5ac502d104
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
scrawl
d3ef075952
Fix an uninitialized variable
10 years ago
scrawl
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
scrawl
2ce269c0fc
Werewolf stats compatibility with old save files
10 years ago
scrawl
d6a7255391
Loading/saving for player's original skills/attributes (prior to becoming a werewolf)
10 years ago
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
10 years ago
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
10 years ago
scrawl
28caeadef4
Improve error message for not found records
10 years ago
cc9cii
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
10 years ago
scrawl
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
b70383d127
Remove last remains of Ogre math
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl
cdd0623009
Terrain rendering
10 years ago
scrawl
de8e5f0db1
Restore projectiles
10 years ago
scrawl
a066b24303
Restore WeaponAnimation
10 years ago
cc9cii
5fd107a95c
Fix crash with array out of bounds when refNum index is incorrect.
10 years ago
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
cc9cii
7f12fc4770
Fix for Bug #2544 . Add a default mNpdtType to ESM::Npc::blank().
10 years ago
scrawl
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
Marc Zinnschlag
ba57a648db
Merge remote-tracking branch 'rohit-n/reorder'
10 years ago
Marc Zinnschlag
607a16eb01
removed leftover ignoreRefNum argument
10 years ago
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
10 years ago
cc9cii
7673be6d0f
Loading of moved refs complete.
10 years ago
cc9cii
e668b35b02
Fix typo.
10 years ago
cc9cii
dcce59f76c
Pass MovedCellRef info to RefCollection. Still has debugging code.
10 years ago
cc9cii
acb800b8f9
Resolve merge issues and fix typos.
10 years ago
cc9cii
f1a58994c6
Merge branch 'master' into moveref
...
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
10 years ago