Chris Robinson
158e18b98d
Remove an unused method
2013-02-16 00:30:07 -08: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
6a9755778e
Merge remote-tracking branch 'zini/next' into animation2
2013-02-12 18:14:46 -08:00
Marc Zinnschlag
64d9d9e2ce
Merge remote-tracking branch 'wheybags/master' into next
2013-02-10 17:29:28 +01:00
Tom Mason
158c6fc9fa
pressing enter when a messagebox is prompting for "ok", will activate ok button
2013-02-10 14:58:46 +00:00
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
2013-02-09 09:46:57 -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
1747c1e01a
Integrate a new movement solver to handle object movement and collisions
...
Temporary, and pretty breoken. Needs some serious integration fixes.
2013-02-04 07:10:14 -08: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
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
Marc Zinnschlag
2756d3ee94
Merge remote-tracking branch 'wheybags/containerscripts'
2013-01-21 23:02:45 +01:00
Chris Robinson
d2f5a886c7
Handle playgroup and skipanim through mwmechanics
2013-01-16 17:53:18 -08:00
Chris Robinson
63e685ea39
Add a method to get the Animation from a Ptr
2013-01-16 09:59:19 -08:00
Chris Robinson
c1b32d6006
Remove outdated comments
2013-01-16 08:24:20 -08:00
Chris Robinson
3c02e1ccc9
Run physics right after updating the actors
2013-01-16 08:22:38 -08:00
Chris Robinson
1ce8eaf52c
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/actors.cpp
apps/openmw/mwrender/actors.hpp
2013-01-16 07:36:56 -08:00
Chris Robinson
94e30199d1
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2013-01-15 14:59:30 -08:00
Chris Robinson
8a073c113e
Use const references where appropriate
2013-01-15 12:07:15 -08:00
Tom Mason
c138e00aa2
objects scripts are now stopped when they are removed from a container
2013-01-13 17:05:12 +00:00
Chris Robinson
a14132b5a0
Merge remote-tracking branch 'zini/master' into animation2
2013-01-09 11:12:26 -08:00
Tom Mason
5bfdb2449d
allowed dropObjectOnGround to be used on npcs, not just player
2013-01-09 18:53:14 +00:00
Marc Zinnschlag
649ae645f3
Merge remote-tracking branch 'blunted2night/bug_495_v2'
2013-01-09 12:12:41 +01:00
Chris Robinson
9675a6d04a
Merge remote-tracking branch 'zini/master' into animation2
2013-01-08 02:25:37 -08:00
Nathan Jeffords
b9fbd6ae4b
Factored faced object lookups into MWRender::World
...
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
* Changed it to return an object pointer
* Updated clients to use return object directly.
2013-01-07 23:38:08 -08:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
282601d6e9
support the allowSkipping extra parameter for playBink command.
2013-01-07 13:19:52 +01:00
Chris Robinson
efca5ded47
Clean up some header includes to reduce nesting
2013-01-05 21:12:08 -08:00
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
Tom Mason
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
2012-12-20 23:16:34 +00:00
scrawl
64210e6efa
Revert "New Game button"
...
This reverts commit c5dd0e1968
2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb
Revert "remove commandline switch for new game"
...
This reverts commit 86671096ec
2012-12-18 19:09:08 +01:00
Chris Robinson
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
2012-12-18 06:01:21 -08:00
Chris Robinson
2f8daec379
Allow pausing only certain types of sounds
2012-12-18 04:19:35 -08:00
Chris Robinson
a5356e194e
Allow specifying a type for the playTrack method
2012-12-18 01:35:20 -08:00
Chris Robinson
72ffceb206
Add type flags to the sound play mode
2012-12-18 00:57:57 -08:00
scrawl
86671096ec
remove commandline switch for new game
2012-12-16 16:14:49 +01:00
scrawl
c5dd0e1968
New Game button
2012-12-16 16:05:31 +01:00
scrawl
edf18a7d6e
change destruction order to fix crash on exit when a video is playing
2012-12-15 22:01:45 +01:00
Chris Robinson
779ced0889
Add a method to play an audio track with a custom decoder
2012-12-13 00:05:57 -08:00
Chris Robinson
2c1eceb9f0
Add methods to pause and stop all playing sounds (and music)
2012-12-12 02:33:12 -08:00
scrawl
faad64b254
Esc cancels the video
2012-12-12 01:13:53 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
Mark Siewert
8ea9f00e6f
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/cellstore.hpp
apps/openmw/mwworld/containerstore.cpp
apps/openmw/mwworld/localscripts.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm_store/reclists.hpp
components/esm_store/store.cpp
extern/shiny
- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
scrawl
c8562d8442
toggleCollisionBoxes actually does something useful now
2012-11-20 02:20:54 +01:00
Mark Siewert
42eefaf36f
- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned).
...
- Reference loader now (partially) supports MVRF tag.
2012-11-10 21:43:41 +01:00
Marc Zinnschlag
75f64aa38b
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
apps/openmw/mwmechanics/npcstats.cpp
apps/openmw/mwmechanics/npcstats.hpp
2012-11-10 15:44:44 +01:00
Marc Zinnschlag
0ab4068fbd
Merge remote-tracking branch 'scrawl/persuasion' into next
2012-11-10 14:59:52 +01:00
