Marc Zinnschlag
|
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
|
2014-02-01 18:16:32 +01:00 |
|
scrawl
|
205e8aa4e9
|
Feature #957: Implement area magic
|
2014-01-20 13:11:29 +01:00 |
|
scrawl
|
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
|
2014-01-06 00:23:17 +01:00 |
|
Lukasz Gromanowski
|
5c5f87445b
|
Fixes for "Conditional jump or move depends on uninitialised value(s)"
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-30 21:47:06 +01:00 |
|
Marc Zinnschlag
|
e818d43bc3
|
removed an outdated typedef and some dead code
|
2013-12-05 13:21:26 +01:00 |
|
Chris Robinson
|
9d56e2d86d
|
Apply movement by queueing it to do later
|
2013-08-17 22:34:38 -07:00 |
|
Chris Robinson
|
d6324d71bf
|
Ensure mechanics actors/objects are cleared before adding them
|
2013-07-17 21:39:21 -07:00 |
|
Chris Robinson
|
3a1facefdf
|
Store a pointer to the character controller for non-actor objects
|
2013-07-15 23:47:04 -07:00 |
|
Chris Robinson
|
06e631f213
|
Track death separately in the character controller
|
2013-07-15 23:43:33 -07:00 |
|
Chris Robinson
|
4e389b5a8f
|
Store whether a given animation loops in the state table
|
2013-05-12 05:59:39 -07:00 |
|
Chris Robinson
|
04aeb3dd07
|
Rename Mechanics' Activators to Objects
|
2013-03-31 17:32:38 -07:00 |
|