Marc Zinnschlag
e05e683da3
Merge remote-tracking branch 'scrawl/spellcreation'
2012-10-12 17:19:30 +02:00
scrawl
f154031e54
last bits of the gui
2012-10-11 18:26:29 +02:00
Marc Zinnschlag
b2025b9209
Merge branch 'pedantic'
2012-10-11 09:03:14 +02:00
cfcohen
e4a61486c8
Removed minor comments left in by accident.
2012-10-10 22:15:19 -04:00
cfcohen
68a856ff6f
Human readable labels for many records types. Human readable flags
...
for many record types. Improved DialInfo rule parsing. Discovered
several issues involving the assignment of various flag bits.
2012-10-10 22:00:44 -04:00
cfcohen
50e259c060
Remove tabs as requested. Sorry about that, thought I already
...
had. :-) I updated the help to better document the --type option,
although I did not finish reasoning through it's interaction with the
new loading framework. I also expanded the print() methods of a few
more of the record types to make a more consistent commit.
2012-10-09 19:41:45 -04:00
Marc Zinnschlag
35d099a638
disabling gcc extensions
2012-10-09 17:10:25 +02:00
cfcohen
57f3b50dc8
Add more detail to ESMTool record dumping.
2012-10-09 01:33:47 -04:00
scrawl
025e820703
abstracted code and use it in enchanting window as well
2012-10-03 15:36:10 +02:00
scrawl
1c0dd3ccc5
some editing code
2012-10-03 15:06:54 +02:00
scrawl
21493c2dbd
added magic effect flags from Research wiki page
2012-10-01 23:33:07 +02:00
scrawl
63fd8172d8
Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation
2012-10-01 23:09:03 +02:00
scrawl
fa358ab196
change the inventory preview to "inventoryhandtohand" animation pose
2012-10-01 18:04:21 +02:00
scrawl
ff2c2d2b96
Merge branch 'master' into spellcreation
...
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
2012-10-01 17:54:45 +02: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
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
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
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
scrawl
044ab3d2b6
fix error in framelistener with tcg enabled
2012-09-28 17:02:18 +02:00
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
2012-09-27 08:47:47 +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
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
scrawl
b63d205c6e
change the select attribute/skill dialogs to be reusable
2012-09-24 22:09:38 +02:00
Marc Zinnschlag
5bdc7bcacf
Merge branch 'master' into next
2012-09-24 10:14:09 +02:00
scrawl
d393f551ed
edit effect dialog
2012-09-24 08:09:16 +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
scrawl
1cb1259e18
fixing some unrelated warnings
2012-09-23 19:36:37 +02:00
greye
807a56c9e4
fix dynamic potion id
2012-09-23 19:29:00 +04:00
scrawl
9d7c35ae48
and go
2012-09-23 00:36:20 +02:00