d02e075bab
Add setting for exterior cell grid size ( Fixes #1537 )
10 years ago
48d5789aeb
Use a separate flag for references deleted by a content file ( Fixes #2018 )
...
The flag must be separate so as to not contaminate the user's savegame.
Fixes the following use cases that were broken before:
- Content file edits a reference that was already deleted by a previously loaded content file -> reference must stay deleted
- Changed or new content file deletes a reference that is already present in the user's savegame -> reference must be deleted
- Said content file is disabled again - reference must be undeleted
10 years ago
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
10 years ago
064f1964ba
More efficient water walking
10 years ago
20777c1b2e
Optimize physics shape scaling on cell load
10 years ago
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
10 years ago
7252cb63a6
Fix cppcheck issues
10 years ago
3007af44ea
Revert "Don't trigger CellChanged events when crossing exterior cell borders ( Fixes #1874 )"
...
This reverts commit 0c67ff9ed0
10 years ago
0c67ff9ed0
Don't trigger CellChanged events when crossing exterior cell borders ( Fixes #1874 )
10 years ago
9f13315d1c
Remove unused numUnload
11 years ago
2b407a9995
Refactor NIF cache
...
- Remove broken cache locking mechanism
This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.
- Decouple cache from NIFFile (now a new nifcache component)
- Add API for future background loading
- Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
11 years ago
8a4e0a2ce8
Don't fade out screen if teleport target cell is not found
11 years ago
a18cec7c8e
Use a MyGUI widget to render the screen fader ( Fixes #1741 , Fixes #1719 )
11 years ago
b58b8c6f8f
Adjust player position to ground when using a door marker, even if the player is levitating ( Fixes #1737 )
11 years ago
395f98e476
Fix triggering changed flag for all references when cell is visited
...
The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true.
Also clean up RefData interface slightly.
11 years ago
577ed3943b
Show wallpaper when loading a savegame
11 years ago
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
11 years ago
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
ae66d28c87
Feature #32 : Implement respawn for containers, creatures and NPCs
11 years ago
e5a21aca53
Refactor projectiles to no longer use MW-objects
11 years ago
3cdbcf3c28
Merge branch 'actorid' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwmechanics/creaturestats.cpp
11 years ago
2bc2684a66
Fixes #275 : force updating exterior cell maps even if already in cache
11 years ago
961c4d4dc4
Fixes #772 : Give scripts a chance to run before updating map, so that disabled objects are not visible
11 years ago
9a1b5dc1c6
a bit of cleanup
11 years ago
f6a876bc3d
added actor ID
11 years ago
83b6fcf22e
Bug #416 : Workaround for page flipping problem
11 years ago
1d926816b5
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
11 years ago
8730b61362
Render maps after *all* cells have finished loading
...
Still not fixing Bug #772 , but at least this will allow for background loading of terrain.
11 years ago
0ae9cc0106
removed unused function
11 years ago
ca30f2af3d
minor fix
11 years ago
83ded18af0
encapsulated reference collections
11 years ago
367919200f
moved CellRefList into a separate file
11 years ago
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
11 years ago
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
11 years ago
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
11 years ago
9653355cf1
Feature #701 : Spawn levelled creatures in cells
11 years ago
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
11 years ago
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
11 years ago
45847c67ad
Lock NIF cache when loading an interior cell as well. Should improve load performance.
11 years ago
9afdf71af3
Fix crash with player->position command
11 years ago
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
11 years ago
e818d43bc3
removed an outdated typedef and some dead code
11 years ago
4b4025ed0f
Keep the player's CharacterController when changing cells. Fixes several glitches.
11 years ago
992a8e9c36
Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.
11 years ago
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
12 years ago
a546ace94d
Remove an unused method
12 years ago
8c8653160d
Crash fix, material fix
12 years ago
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
12 years ago
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
12 years ago
c7692acb79
Update the player's Ptr in mwrender when changing cells
12 years ago
0c303aa285
fix fading on cell transition when cell is loaded
12 years ago
efdcd9649c
Fading for Exterior->Interior cell transitions
12 years ago
c41f119ba6
Added new game button
12 years ago
1e9656ee9c
Merge remote-tracking branch 'glorf/rotate-update1'
12 years ago
7cd4dd0c91
Improved local rotations
12 years ago
547f77031d
Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again
12 years ago
1e92ffc314
Added rotation layer
12 years ago
01ae91f640
Fix several NPCs spawning in the ground
12 years ago
2e7d5377f4
Fix crash when moving npcs to an inactive cell
12 years ago
ebaf80d539
Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.
12 years ago
feaf2b43fb
disabled and deleted objects where not correctly ignored during adding objects to a cell when it became active
12 years ago
6cef7fb610
rescale all objects to the range of [0.5, 2] when a cell becomes active
12 years ago
d3c1f5e7b2
renamed low-level NIF related files and include guards to conform to naming convention
12 years ago
f66f67eaa1
Loading text uses now the corresponding GMSTs
12 years ago
a6fb58bc59
Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell"
...
This commit replaces the default "Loading Cell" text with "Loading
Interior" and "Loading Exterior"
12 years ago
d4aa33b9a7
Removing the unloading cells part instead of just commenting them.
12 years ago
ffd96c7715
Removed "Unloading Cell..." text from loading screen
...
OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of
the "flicker" every time a cell loads.
12 years ago
db9a3aeddf
Merge remote-tracking branch 'zini/master' into animation2
12 years ago
44b1c66c4b
fixed various warnings about converting size_t to int
12 years ago
fe0e6c452d
Remove the unneeded playerMove object from PhysicsSystem
12 years ago
8d98f3649c
Use a separate class to handle activator mechanics
12 years ago
1ce8eaf52c
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/actors.cpp
apps/openmw/mwrender/actors.hpp
12 years ago
94e30199d1
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
12 years ago
d5ebd6654d
cache loaded NIF files to eliminate reloads
...
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
12 years ago
efca5ded47
Clean up some header includes to reduce nesting
12 years ago
918316168f
Merge remote-tracking branch 'greye/store' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
12 years ago
ff8da265ed
applying new interface vol.9, inconsistent
12 years ago
5c1b3fc043
Fixed: scene: adjust rotation/scale when creating objects
12 years ago
d205723a17
resolving m prefix/ESMStore movement
12 years ago
2057f5619e
move ESMStore to MWWorld
12 years ago
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
12 years ago
accf8b2f71
Updated Bug #430 fix so it only moves the player now
12 years ago
cadc753216
Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell
...
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
12 years ago
15f972cc62
fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit
...
todo: going from CharacterCreation back to CreateClassDialog loses data
12 years ago
7606ebafd6
resolving conflicts, minor update
12 years ago
2f0b47fc38
test
12 years ago
d5a08e31e7
scene does not disappear anymore during load
12 years ago
2b339f6c0f
loading screen
12 years ago
88e70cb5bd
Merge branch 'decouple'
13 years ago
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
13 years ago
484cce12a8
Issue #107 : removed redundant getStore function from window manager
13 years ago
b68f9d6a28
Issue #107 : MechanicsManager is accessed only through the interface class from now on
13 years ago
45306e4bc3
fixed rotation adjustment
13 years ago
5018db3332
removed some redundant code, added some comments
13 years ago
38b06aee6c
resolving conflicts
13 years ago
aca08eb4c2
Merge branch 'decouple' into player_control
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.hpp
13 years ago
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
13 years ago
ec9cf4d3c6
rotateObject() added, input system rewritten
13 years ago
b6f7f21bcf
fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added
13 years ago
f2a2e5f57d
remove MWWorld::Player::setPos()
13 years ago
26595f22f6
float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
13 years ago
49b1d5e127
fix object placing
13 years ago
e1c7d1f529
fixed item sinking
13 years ago
61cb012ee7
moving Scene::insertObject to CellStore::insertObject, part 1
13 years ago
b760225179
wrong branch
...
This reverts commit d36d6aacf4
13 years ago
d36d6aacf4
move Scene::insertObject to CellStore::insertObject, part 1
13 years ago
9a2690f849
Revert "wrong"
...
This reverts commit 3aa53fea32
13 years ago
3aa53fea32
wrong
13 years ago
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
87667ab57e
Issue #107 : Ptr related include cleanup
13 years ago
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
13 years ago
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
13 years ago
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
13 years ago
36d26e0681
set the camera orientation after using teleport doors
13 years ago
0131c53005
Issue #176 : removed enable/disable functions from MWWorld::Class
13 years ago
1f85475536
Merge branch 'master' into inventoryGUI
13 years ago
ae77e7b0d8
don't try to retrieve land data from non-predefined cells.
13 years ago
6b74fec8ed
don't do a half finished cell change, when trying to switch to an interior cell that does not exist
13 years ago
fca9f1fc5f
gold dropping works without crash, but the code needs clean up.
13 years ago
178ad876d7
fix for objects other than Miscellaneous.
13 years ago
f73d3ad33f
fix to the "drop object on ground" feature. still crashes for gold.
13 years ago
d3e162ec83
dropping items works
13 years ago
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
e443455612
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
13 years ago
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
13 years ago
c6da3872b4
light improvements
13 years ago
75b336baea
Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2
...
Conflicts:
apps/openmw/mwinput/inputmanager.cpp
apps/openmw/mwworld/player.cpp
libs/openengine/bullet/physic.cpp
13 years ago
4d07ae7fe0
Swimming working
13 years ago
f2fae770d4
Merge branch 'master' into physicsaedra2
...
Conflicts:
apps/openmw/mwworld/player.cpp
13 years ago
052cc47ee9
fixed waterAdded
13 years ago
c0af3c7241
Merge branch 'master' into terraincollision
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
c5f044eb0d
fixed compilation
13 years ago
58f7a03626
Merge branch 'terrain18' into terraincollision
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
51fb9e67cd
Merge
13 years ago
91d2031eb7
first attempt at map window
13 years ago
2edd7e59f4
some fixes and facilities for saving the fog of war to disk
13 years ago
9612ce595b
Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision
...
Conflicts:
CMakeLists.txt
13 years ago
fa68be2b19
set map window cell name
13 years ago
5b38b17baf
local map rendering (nothing to see yet, as it is not displayed in GUI)
13 years ago
f79bf1f300
fog
13 years ago
38a0d1d1c5
Merging in master
13 years ago
2d0e83a2cf
Reversing changes
13 years ago
9c73fa6b6d
Physics sort of fixed
13 years ago
16bc374921
animation updates were hooked up to the wrong update function
13 years ago
e1aba44da6
Switching cells in exterior works
13 years ago
ec94ecacaf
Zinis branch merge
13 years ago
a0838369b2
Very basic exterior water
13 years ago
2aad3a0bd8
Correct water levels
13 years ago
8798f7dd40
Bringing in some of Azathoth's work
13 years ago
scrawl
Thoronador
Emanuel Guevel
Marc Zinnschlag
Chris Robinson
greye
vorenon
Glorf
Nathan Jeffords
emoose
guidoj
Jason Hooks