Glorf
aebd9a3700
Weather to pull
2013-03-10 00:24:14 +01:00
scrawl
5c94c654d4
Fix wrong rotation of objects dropped on the ground
2013-03-09 13:27:24 +01:00
scrawl
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
2013-03-08 23:46:25 +01:00
scrawl
66a754e9aa
Fix tooltip position when hovering the crosshair over NPCs
2013-03-07 15:25:22 +01:00
Marc Zinnschlag
642653d10e
World constructor fixes
2013-03-06 19:57:00 +01:00
Marc Zinnschlag
d839a4c6c2
Merge remote-tracking branch 'scrawl/graphics'
2013-03-05 16:31:22 +01:00
scrawl
fe7b2732d8
Avoid manually updating render targets from within frameRenderingQueued
2013-03-05 14:24:29 +01:00
Marc Zinnschlag
dc3edc6024
Merge branch 'vartype'
2013-03-05 10:59:08 +01:00
Marc Zinnschlag
ba4907fbaf
use new Variant type for GMSTs
2013-03-05 08:02:27 +01:00
scrawl
11f21a1988
Weather update should be before renderer update
2013-03-03 15:10:40 +01:00
Marc Zinnschlag
dc445844d2
Merge remote-tracking branch 'scrawl/z-up'
2013-02-26 14:37:50 +01:00
scrawl
cd68012498
Z-up conversion: raycasts
2013-02-26 14:28:35 +01:00
scrawl
2e7bc1a368
Z-up conversion: local map, fix tcg
2013-02-26 13:39:10 +01:00
Marc Zinnschlag
bd9884b244
Merge remote-tracking branch 'chris/misc-cleanup'
2013-02-25 19:45:09 +01:00
Marc Zinnschlag
08f13ef5ab
Merge remote-tracking branch 'greye/master'
2013-02-25 19:34:03 +01:00
greye
661fd73c6e
fix rotation for objects in inactive cells and forced vanity mode
2013-02-25 22:00:50 +04:00
Chris Robinson
48271e49ec
Properly update the Ptr object in the mechanics manager when moving across cells
2013-02-25 09:57:34 -08:00
scrawl
355390429e
Fix World::isUnderwater to use dynamic waterlevel
2013-02-25 17:27:50 +01:00
greye
6a8c532244
fix and unify object cell change update in mwrender
2013-02-24 15:04:56 +04:00
Chris Robinson
0148db8ccf
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
2013-02-23 05:59:35 -08:00
greye
d983ed5c78
fix invalid SceneNode pointer on cell change
2013-02-23 16:45:55 +04:00
Chris Robinson
9c3af5f344
Do not interpret noclip mode as flying
2013-02-22 01:26:30 -08:00
Chris Robinson
cfdc820a1f
Make an actor fly when it has a levitate effect
2013-02-20 01:55:12 -08:00
Chris Robinson
5a1a0b7338
Add and use an MWWorld::isFlying method
2013-02-18 22:39:43 -08:00
scrawl
5d403ebdd3
Fix collision debug drawer (tcg)
2013-02-19 04:03:24 +01:00
Chris Robinson
ac717373b1
Add a method to check if an object is on the ground
2013-02-14 22:35:15 -08:00
Chris Robinson
18b606fddf
Use the PhysicActor's set/getOnGround method
2013-02-14 20:10:04 -08:00
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
2013-02-09 09:46:57 -08:00
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
2013-02-09 15:30:29 +01:00
Mark Siewert
55bd9eef66
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-09 13:03:35 +01:00
Mark Siewert
eefbdde6de
- For pull request: remove all instances of maps used to track refnumbers.
...
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
2013-02-09 13:00:57 +01:00
Chris Robinson
8de2d24d0e
Restore old ground check
2013-02-06 21:57:59 -08:00
Chris Robinson
e577ee2de8
Add a method to set/retrieve being on the ground
2013-02-06 21:44:58 -08:00
Chris Robinson
bdda7278c4
Use 3/4ths of the physic actor's height to test if swimming
2013-02-06 12:56:30 -08:00
Marc Zinnschlag
43912f927a
Merge remote-tracking branch 'potatoesmaster/importer' into next
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-02-06 10:12:40 +01:00
Chris Robinson
9cf30f39bd
Don't apply gravity when swimming
2013-02-05 19:45:51 -08:00
Chris Robinson
2c39760bd5
Move the movement solver code to mwworld's physics system
2013-02-05 12:45:10 -08:00
Chris Robinson
0a4568bd11
Move the PtrMovementList typedef to MWWorld
...
Use it for the doPhysics parameter, too
2013-02-05 11:03:39 -08:00
Chris Robinson
2cdda96798
Clear out some unneeded doPhysics stuff
2013-02-05 10:23:26 -08:00
Chris Robinson
4bd1e63ac1
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-02-05 03:26:46 -08:00
Marc Zinnschlag
c409f1184e
cleaned up object movement and fixed a bug regarding local scripts
2013-02-05 12:19:06 +01:00
Tom Mason
ac112ef972
refactored special variable code
2013-02-03 13:27:27 +00:00
Tom Mason
9ad08520fd
Implemented OnPCDrop special variable
...
Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.
2013-01-31 18:45:32 +00:00
Tom Mason
dc91211b12
Fixed Small bug where scripts were being removed when they shouldn't be.
...
Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.
2013-01-31 00:21:04 +00:00
Chris Robinson
fdabef65a1
Use a method to update an object's cell in the mechanics manager
...
This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells.
2013-01-29 00:19:24 -08:00
Chris Robinson
8d98f3649c
Use a separate class to handle activator mechanics
2013-01-28 23:39:11 -08:00
Chris Robinson
7b71b4eb31
Add a missing include
2013-01-27 03:03:48 -08:00
Chris Robinson
0cd3880b20
Merge remote-tracking branch 'zini/master' into animation2
2013-01-26 04:54:52 -08:00
Mark Siewert
dca8dc4fdb
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/esmreader.hpp
- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
2013-01-25 18:22:01 +01:00
Tom Mason
f5f3c2e62d
enabling / disabling should not affect scripts
2013-01-21 20:06:08 +00:00
