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 |
|
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 |
|
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 |
|
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 |
|
greye
|
5b2b378f25
|
tvm script instruction
|
2012-08-18 18:05:10 +04:00 |
|
greye
|
0e6e141fd4
|
camera control related script instructions
|
2012-08-17 15:20:57 +04:00 |
|
greye
|
392e6efcb5
|
initial player rendering
|
2012-08-17 15:19:43 +04:00 |
|
greye
|
6f87c0c36d
|
preview mode, advanced vanity support
|
2012-08-17 15:19:43 +04:00 |
|
greye
|
c46eeaa100
|
initial 3d-person camera support
|
2012-08-17 15:19:43 +04:00 |
|
Marc Zinnschlag
|
766e782aae
|
Merge remote branch 'greye/cross_cell-borders'
|
2012-08-11 12:05:10 +02:00 |
|
greye
|
45306e4bc3
|
fixed rotation adjustment
|
2012-08-11 13:23:54 +04:00 |
|
scrawl
|
11fadf4a07
|
forgot something
|
2012-08-10 16:25:27 +02:00 |
|
scrawl
|
44ff31b50a
|
removed world exit methods
|
2012-08-10 16:21:53 +02:00 |
|
scrawl
|
f72956b918
|
- added a simple main menu (with Return, Options and Exit buttons)
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
|
2012-08-10 15:15:48 +02:00 |
|
greye
|
38b06aee6c
|
resolving conflicts
|
2012-08-09 21:49:00 +04:00 |
|
greye
|
ec9cf4d3c6
|
rotateObject() added, input system rewritten
|
2012-08-09 00:15:52 +04:00 |
|
greye
|
b6f7f21bcf
|
fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added
|
2012-08-08 14:51:33 +04:00 |
|
greye
|
ff62770657
|
World::isUnderwater(), World::isSwimming()
|
2012-08-03 14:42:09 +04:00 |
|