Marc Zinnschlag
|
6469933ce8
|
Merge branch 'master' into alchemy
Conflicts:
apps/openmw/mwgui/alchemywindow.cpp
|
2012-10-02 09:30:49 +02:00 |
|
scrawl
|
fa358ab196
|
change the inventory preview to "inventoryhandtohand" animation pose
|
2012-10-01 18:04:21 +02:00 |
|
Marc Zinnschlag
|
abb03ac178
|
Merge remote-tracking branch 'scrawl/master'
|
2012-10-01 17:54:36 +02:00 |
|
scrawl
|
1f087645a7
|
update shiny to auto-delete the corresponding cache if a shader was edited
|
2012-10-01 17:02:14 +02:00 |
|
greye
|
31f7325e1f
|
fix land loading
|
2012-10-01 15:46:32 +04:00 |
|
Marc Zinnschlag
|
d1c4559abe
|
fixed GMST string handling in GUI
|
2012-10-01 10:03:49 +02:00 |
|
Marc Zinnschlag
|
35d7b5e5b0
|
Merge remote-tracking branch 'greye/record_saving'
|
2012-10-01 09:50:20 +02:00 |
|
Marc Zinnschlag
|
29633bd02f
|
Merge remote-tracking branch 'greye/master'
|
2012-10-01 09:46:20 +02:00 |
|
greye
|
f907a6a86f
|
updateListener() every frame
|
2012-10-01 11:24:44 +04:00 |
|
Chris Robinson
|
6c5c9ce46e
|
Avoid console spam when a sound can't play
|
2012-09-30 17:38:55 -07:00 |
|
Chris Robinson
|
6942fa97da
|
Specify a proper up vector for the listener
|
2012-09-30 17:23:05 -07:00 |
|
Chris Robinson
|
991f942fba
|
Merge remote-tracking branch 'zini/master' into sound
Conflicts:
apps/openmw/mwsound/soundmanagerimp.cpp
apps/openmw/mwsound/soundmanagerimp.hpp
|
2012-09-30 16:57:54 -07:00 |
|
greye
|
93078bb0dc
|
move record ids to defs.hpp
|
2012-10-01 00:55:27 +04:00 |
|
greye
|
3494e17b7c
|
wipe record superclass
|
2012-10-01 00:51:54 +04: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 |
|
Marc Zinnschlag
|
10c8360e07
|
Issue #61: Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class
|
2012-09-30 19:05:45 +02:00 |
|
Marc Zinnschlag
|
42f02f3ccd
|
Issue #61: Re-implemented tool selection in Alchemy class
|
2012-09-30 18:54:20 +02:00 |
|
Marc Zinnschlag
|
20a263738a
|
Merge remote-tracking branch 'chris/animation'
|
2012-09-29 12:39:56 +02:00 |
|
Chris Robinson
|
41f80908d9
|
Simplify getting the stop time when playing all animation groups
|
2012-09-29 01:10:49 -07:00 |
|
Marc Zinnschlag
|
2ab96d0108
|
Merge remote-tracking branch 'scrawl/next'
|
2012-09-29 10:03:52 +02:00 |
|
Marc Zinnschlag
|
c6fd864a76
|
Issue #61: Forgot to add some files
|
2012-09-29 10:02:46 +02:00 |
|
scrawl
|
0c6ad13364
|
WakeUpPc instruction
|
2012-09-29 09:41:34 +02:00 |
|
Chris Robinson
|
cd8515396a
|
Use a multimap to store the text keys
|
2012-09-28 23:20:15 -07:00 |
|
Chris Robinson
|
9b491edbf8
|
Small cleanup for loading animation keyframes
|
2012-09-28 18:53:24 -07:00 |
|
scrawl
|
044ab3d2b6
|
fix error in framelistener with tcg enabled
|
2012-09-28 17:02:18 +02:00 |
|
Marc Zinnschlag
|
cd343c4fbd
|
Issue #61: Basic alchemy class (doesn't do anything yet)
|
2012-09-27 11:59:40 +02:00 |
|
scrawl
|
9b0254a158
|
small map fix
|
2012-09-26 23:34:35 +02:00 |
|
Marc Zinnschlag
|
bb6d9a329c
|
Merge remote-tracking branch 'scrawl/book_skillgain' into next
|
2012-09-26 20:35:48 +02:00 |
|
scrawl
|
71d04e16da
|
fix the global map updating when pinned
|
2012-09-25 21:57:57 +02:00 |
|
scrawl
|
8daf790235
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into next
|
2012-09-25 21:50:33 +02:00 |
|
scrawl
|
caef570c8a
|
fix the weather not changing when sleeping/waiting
|
2012-09-25 21:49:34 +02:00 |
|
scrawl
|
359824d614
|
oops
|
2012-09-25 21:49:34 +02:00 |
|
scrawl
|
4453459378
|
re-use the texture across preview instances
|
2012-09-25 21:49:34 +02:00 |
|
scrawl
|
e2b1329620
|
fix the race selection escape crash
|
2012-09-25 21:49:34 +02:00 |
|
scrawl
|
d163f8203c
|
change books to RecListWithIDT
|
2012-09-25 21:38:34 +02:00 |
|
scrawl
|
853d62adba
|
book skillgain
|
2012-09-25 18:59:24 +02:00 |
|
Marc Zinnschlag
|
a34bdb9623
|
per NPC ID interaction tracking
|
2012-09-25 10:48:57 +02:00 |
|
Marc Zinnschlag
|
5bdc7bcacf
|
Merge branch 'master' into next
|
2012-09-24 10:14:09 +02:00 |
|
scrawl
|
02e7b3df4f
|
oops
|
2012-09-24 01:07:33 +02:00 |
|
scrawl
|
f8a18d58a6
|
re-use the texture across preview instances
|
2012-09-24 01:06:17 +02:00 |
|
scrawl
|
dd5c083124
|
fix the race selection escape crash
|
2012-09-24 00:42:05 +02:00 |
|
greye
|
1339787863
|
remove underscores from filenames in esm
|
2012-09-23 23:12:10 +04:00 |
|
greye
|
7368e7b655
|
rename getASCII() to getLegacyEnc()
|
2012-09-23 22:20:18 +04:00 |
|
greye
|
c54750977f
|
remove underscores in guards
|
2012-09-23 22:11:08 +04:00 |
|
scrawl
|
1cb1259e18
|
fixing some unrelated warnings
|
2012-09-23 19:36:37 +02:00 |
|
scrawl
|
bf3aad8be0
|
handle NCC flag
|
2012-09-23 18:30:13 +02:00 |
|
greye
|
807a56c9e4
|
fix dynamic potion id
|
2012-09-23 19:29:00 +04:00 |
|
scrawl
|
b4db339fd5
|
everything uses find now
|
2012-09-22 21:39:05 +02:00 |
|
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
2012-09-22 21:35:57 +02:00 |
|