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
|
c75a5ae212
|
string compare and tolower
|
2012-12-28 18:05:52 +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 |
|
Chris Robinson
|
7b2c3e6cd3
|
Pass a proper PlayMode enum to playSound and playSound3D
|
2012-12-18 06:01:21 -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
|
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 |
|
scrawl
|
e3dd3d565c
|
fix 2 leaks
|
2012-12-10 00:59:39 +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 |
|
scrawl
|
1ccad32877
|
GetWeaponType
|
2012-11-25 02:06:43 +01:00 |
|
scrawl
|
e8ef4dba1e
|
getPcRunning, getPcSneaking, getForceRun, getForceSneak
|
2012-11-24 02:02:49 +01:00 |
|
Marc Zinnschlag
|
d7af9fbec6
|
various fixes
|
2012-11-22 17:24:28 +01:00 |
|
Marc Zinnschlag
|
9201baebf9
|
template fix
|
2012-11-22 10:19:11 +01:00 |
|
Marc Zinnschlag
|
5d45bcd03a
|
Merge remote-tracking branch 'trombonecot/master'
Conflicts:
apps/openmw/mwclass/light.cpp
|
2012-11-19 21:21:00 +01:00 |
|
eduard
|
4e4d15f8ac
|
Failed action
|
2012-11-19 21:04:49 +01:00 |
|
eduard
|
82ea547ce4
|
Failed action
|
2012-11-17 18:17:08 +01:00 |
|
Marc Zinnschlag
|
9669eed083
|
Issue #219: added last missing function filters
|
2012-11-15 20:00:27 +01:00 |
|
greye
|
235b565bb7
|
update main character model
|
2012-11-10 11:51:48 +04:00 |
|
Marc Zinnschlag
|
2be60041f3
|
Merge remote-tracking branch 'greye/player-dynamics' into next
|
2012-11-08 18:32:25 +01:00 |
|
greye
|
af5fb7916f
|
fix searching in store
|
2012-11-08 21:07:14 +04:00 |
|
greye
|
b5a59c3a07
|
minor doxygen comments update
|
2012-11-08 19:01:42 +04:00 |
|
greye
|
2a86432887
|
store birthsign in MWWorld::Player
|
2012-11-08 18:50:23 +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
|
9ab2c16055
|
store created character classes as dynamic records
|
2012-11-08 01:22:44 +04:00 |
|
greye
|
78740306db
|
non-const access to Store<T> from ESMStore
|
2012-11-08 01:21:54 +04:00 |
|
Marc Zinnschlag
|
c5a6171aab
|
cleanup
|
2012-11-07 19:43:42 +01: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
|
bc218759e9
|
forgotten module
|
2012-11-07 15:38:25 +04:00 |
|
greye
|
58b7927a36
|
move 'player' record to dynamic
|
2012-11-06 18:17:32 +04:00 |
|
greye
|
83f5b1df81
|
change to static --> dynamic search order
|
2012-11-06 17:58:49 +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 |
|