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
23dada0ee4
moved script handling on enable / disable into their own functions
2013-01-20 16:38:56 +00:00
Tom Mason
c138e00aa2
objects scripts are now stopped when they are removed from a container
2013-01-13 17:05:12 +00: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
Nathan Jeffords
719663d86e
added option to override the activation distance
...
The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
2013-01-08 20:00:06 -08:00
Nathan Jeffords
b3932e3dea
added a separate activation distance for NPCs
2013-01-07 23:40:17 -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
Nathan Jeffords
05dad29005
update MWWord::World to track distances while performing occlusion queries.
...
This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.
2013-01-07 23:11:15 -08:00
Nathan Jeffords
86f691d3d5
split MWWord::World::update into multiple functions
2013-01-07 22:48:24 -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
Emanuel Guevel
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
2013-01-06 01:37:58 +01:00
Marc Zinnschlag
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
2012-12-26 15:50:03 +01:00
lazydev
74ae479780
Cell names localization fix
2012-12-23 23:23:24 +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
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
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
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
greye
b5a59c3a07
minor doxygen comments update
2012-11-08 19:01:42 +04:00
greye
83e758ee50
clean up interfaces
2012-11-08 16:37:57 +04:00
greye
9dc9098fa7
update MWBase::World interface since records contains own id
2012-11-08 01:52:34 +04:00
greye
5b9621bca5
store player record data in ESMStore
2012-11-08 01:36:43 +04:00
Marc Zinnschlag
918316168f
Merge remote-tracking branch 'greye/store' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
2012-11-07 19:34:28 +01:00
Mark Siewert
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
2012-11-06 20:37:29 +01:00
greye
9f1733a415
move record insertion to ESMStore
2012-11-06 17:51:38 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
emoose
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)
2012-11-03 19:29:55 +00:00
scrawl
33361e6539
Merge branch 'master' into spellcreation
2012-10-23 10:38:53 +02:00
scrawl
d76522e7a4
searchPtrViaHandle
2012-10-19 19:48:02 +02:00
scrawl
c991f68a2d
buying created spell
2012-10-15 21:54:19 +02:00
Mark Siewert
28d4d7ea3f
Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.
...
- Remove check for 255 master/plugin files.
2012-10-07 20:00:55 +02:00
scrawl
73c69e8eda
video playback
2012-09-25 02:35:50 +02:00
scrawl
9106e5307c
moved global map from RenderingManager to gui and removed world method
2012-09-21 14:11:01 +02:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
scrawl
bf5e30b24f
everything done except health/mana restore
2012-09-19 02:53:06 +02:00
scrawl
ab698bb401
date time label
2012-09-18 20:53:32 +02:00
Marc Zinnschlag
4469976be9
Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-09-18 10:44:25 +02:00
gugus
032ff7c879
Clean-up. There is still a little bug.
2012-09-17 13:36:48 +02:00
Marc Zinnschlag
b7c9285b24
added support for out of world rendering
2012-09-14 21:12:16 +02:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +02:00
scrawl
5834b4baa5
door markers on the local map
2012-08-28 17:30:34 +02:00
greye
e6c3e0744e
tvm update and fix
2012-08-19 10:37:51 +04:00
