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 |
|
Marc Zinnschlag
|
8e1a2e3a13
|
Issue #474: adjust global variable pcrace
|
2012-12-04 10:58:43 +01:00 |
|
greye
|
235b565bb7
|
update main character model
|
2012-11-10 11:51:48 +04:00 |
|
greye
|
83e758ee50
|
clean up interfaces
|
2012-11-08 16:37:57 +04:00 |
|
greye
|
2a06d72e32
|
remove unused custom character classes
|
2012-11-08 02:27:01 +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 |
|
greye
|
78740306db
|
non-const access to Store<T> from ESMStore
|
2012-11-08 01:21:54 +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
|
11c0e6382f
|
make ESMStore setting up itself after loading
|
2012-11-07 15:41:59 +04:00 |
|
greye
|
9f1733a415
|
move record insertion to ESMStore
|
2012-11-06 17:51:38 +04:00 |
|
Marc Zinnschlag
|
d661d4f6d6
|
Merge remote-tracking branch 'emoose/bug-368' into next
|
2012-11-06 13:04:38 +01:00 |
|
greye
|
dccc157f4c
|
setting up
|
2012-11-06 15:26:55 +04:00 |
|
greye
|
242a9b5a59
|
various interface fixes, commented unused code
|
2012-11-06 14:03:36 +04:00 |
|
greye
|
e74b2c060d
|
disable createRecord(), Land constness hack, various fixes with Store<T> interface
|
2012-11-06 13:14:03 +04:00 |
|
greye
|
ff8da265ed
|
applying new interface vol.9, inconsistent
|
2012-11-06 12:36:21 +04:00 |
|
emoose
|
3e5b396b56
|
Changed: world: cleanup
|
2012-11-05 21:10:04 +00:00 |
|
emoose
|
e8e3c211a4
|
Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation
|
2012-11-05 19:56:20 +00:00 |
|
emoose
|
7a7825577a
|
Changed: use MWWorld::Ptr for PhysicsSystem arguments
|
2012-11-05 19:37:27 +00:00 |
|
Marc Zinnschlag
|
61942c9c4a
|
Issue #440: Make day numbers start at 1 instead of 0
|
2012-11-05 18:01:50 +01:00 |
|
greye
|
d205723a17
|
resolving m prefix/ESMStore movement
|
2012-11-05 18:02:47 +04:00 |
|
greye
|
2057f5619e
|
move ESMStore to MWWorld
|
2012-11-05 17:18:01 +04:00 |
|
greye
|
3c2ce25f5f
|
m prefix for mwworld/cellstore.hpp
|
2012-11-05 16:07:59 +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
|
28cc480ce1
|
fix some alchemy issues and make the gui use the new implementation
|
2012-10-18 22:21:39 +02:00 |
|
scrawl
|
c991f68a2d
|
buying created spell
|
2012-10-15 21:54:19 +02:00 |
|
greye
|
2fa4ac177a
|
initial resolving
|
2012-10-01 00:23:49 +04:00 |
|
greye
|
721324c1db
|
rm record inheritance, rework esmtool accordingly
|
2012-09-30 23:34:53 +04:00 |
|
scrawl
|
caef570c8a
|
fix the weather not changing when sleeping/waiting
|
2012-09-25 21:49:34 +02:00 |
|
greye
|
807a56c9e4
|
fix dynamic potion id
|
2012-09-23 19:29:00 +04:00 |
|
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
2012-09-22 21:35:57 +02:00 |
|
scrawl
|
9106e5307c
|
moved global map from RenderingManager to gui and removed world method
|
2012-09-21 14:11:01 +02:00 |
|
greye
|
18cc435aa1
|
resolving conflicts
|
2012-09-21 13:13:11 +04: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 |
|
Marc Zinnschlag
|
a3c680d20a
|
Merge remote-tracking branch 'scrawl/sleep_wait' into next
|
2012-09-19 09:41:32 +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
|
4abb9a00da
|
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
|
2012-09-18 11:25:09 +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 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
Jason Hooks
|
f586f53a42
|
positioning
|
2012-09-15 16:45:50 -04:00 |
|
scrawl
|
2793096b50
|
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
|
2012-09-15 00:57:29 +02:00 |
|
Marc Zinnschlag
|
b7c9285b24
|
added support for out of world rendering
|
2012-09-14 21:12:16 +02:00 |
|