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
scrawl
68f93294da
Port EffectManager
10 years ago
scrawl
25f1c1ae76
Remove persistent flag which will be unused
10 years ago
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
scrawl
232e34bddd
OpenCS: port lighting toolbar, fix multiple context GL objects issue
10 years ago
scrawl
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
Nikolay Kasyanov
3e45e9a48a
Remove no longer required strnlen wrapper
...
It was used for MinGW & OS X < 10.7. Minimal OS X version was bumped to
10.7 and MinGW support was recently dropped (see
1eaa64c49c
).
10 years ago
cc9cii
488bc76da5
Fix saving land data.
10 years ago
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
5f051b5bf2
Remove comment about GMST cleaning which was removed.
10 years ago
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
10 years ago
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
10 years ago
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
10 years ago
dteviot
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
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
10 years ago
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
10 years ago
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
cc9cii
d28f257ada
Fix for bug #2428 . Set default flag value (mandatory) for containers.
10 years ago
Marc Zinnschlag
4e1c086d6a
load start up script records
10 years ago
Marc Zinnschlag
bf92d5cde9
removed redundant mScript field in ESM::StartScript
10 years ago
scrawl
da690c91b3
Delete the old Ogre DataStream class
10 years ago
scrawl
8f0ab7d09f
ESM component no longer relies on Ogre DataStreams
10 years ago
Marc Zinnschlag
8686ffcedb
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
96a295c44f
Fix for deleting all items in a levelled list
10 years ago
scrawl
8b417c06db
Fix missing clear in ESM::Spell::load ( Fixes #2368 )
10 years ago
Kamil Bar
3b7a23aa72
Fixed charge checks for light and other objects, corrected CellRef charge union comments
10 years ago
scrawl
49d912e5b6
Don't rely on subrecord order part 2
...
Nice side effects:
- Subrecord name comparison now uses magic number instead of string (faster)
- Improves the error message for unknown subrecords: will print the record in question instead of failing to read the next record with a strange error
10 years ago
scrawl
9009889d24
Don't rely on subrecord order when reading ( Fixes #2361 )
10 years ago
scrawl
cff0127ce7
Update comment on merging levelled lists
10 years ago
scrawl
d18d2a1882
Skip rest of LEVI record if it has no items (Bug #2348 )
10 years ago
scrawl
bea88c3643
Stolen item tracking overhaul part 2 ( Fixes #2338 )
10 years ago
scrawl
6d097fbfbd
Normalise spelling of "levelled" throughout the code
10 years ago
scrawl
fec8cf91f5
Add exception handling to various uses of DataStream::read
10 years ago
scrawl
2346c3528d
Remove NpcStats::mProfit and store it in the script instead
...
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
10 years ago
scrawl
b9acf437fd
Remove friendly hits from the save file
...
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
10 years ago
scrawl
081c8c8615
ESSImport: convert to utf8, based on encoding setting in openmw.cfg
10 years ago
scrawl
e712b0353b
Terrain refactoring, reduce game startup time and memory usage
10 years ago
scrawl
62a32220ff
Use low-LOD heightmap for world map rendering
...
Add vanilla-accurate colour palette (thanks Hrnchamd)
10 years ago
scrawl
431f540791
ESSImport: fix NPC factions
10 years ago
scrawl
875df46ae9
ESSImport: convert journal indices
10 years ago
scrawl
6367b4dc0b
Improve INFO struct naming
10 years ago
scrawl
9d3f0b2ed5
Remove some unused code, include cleanup
10 years ago
scrawl
d34086ac8f
ESSImport: convert running global scripts
10 years ago
dteviot
946dd16696
Fixed Windows warning.
...
warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
10 years ago
dteviot
f95743ccc3
Fixed MSVC warning.
...
warning C4305: 'return' : truncation from 'double' to 'float'
10 years ago
dteviot
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
Nathan Aclander
33ce03dfc5
Should be compared against uint only
10 years ago
scrawl
b1bd236345
ESSImport: convert script local variables
...
Had to add special reading code to openmw, because the variable names are not stored.
10 years ago
Marc Zinnschlag
7f905470fa
fixed moved reference loading
10 years ago
scrawl
7d76213374
Fix loading faction reactions for older savegames ( Fixes #2301 )
10 years ago
Marc Zinnschlag
89998a6a03
save MVRF subrecords
10 years ago
scrawl
79d2eebe54
Store selected enchant item in savegame ( Fixes #1702 )
10 years ago