krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
5047 commits 35 branches 0 tags 65 MiB
Commit graph

128 commits

Author SHA1 Message Date
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
greye
7e0713f6c4 fix string case update 2012-12-31 11:22:40 +04:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
eduard
98103e15eb conflict resolution 2012-12-30 13:46:07 +01:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 2012-12-30 13:09:37 +01:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +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
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
 2012-12-11 22:28:23 +01:00
Marc Zinnschlag
8e1a2e3a13 Issue #474: adjust global variable pcrace 2012-12-04 10:58:43 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-12-01 11:30:51 +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
scrawl
dc33dee22e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
 2012-10-01 20:25:23 +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