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
scrawl
94f2937c8f
missed a warning
2012-10-09 19:28:10 +02:00
Marc Zinnschlag
fb7e5699aa
Merge branch 'master' into pedantic
2012-10-09 19:24:27 +02:00
scrawl
d97184cd4d
fixing some warnings
2012-10-09 17:48:44 +02:00
Marc Zinnschlag
3fd887c030
silenced some warnings
2012-10-09 17:11:41 +02: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
gugus
27a3487d78
right prices
2012-10-08 15:51:36 +02:00
gugus
5a611b66d7
traveling.
2012-10-08 11:14:22 +02:00
gugus
1f4de03613
oooups
2012-10-06 22:33:10 +02:00
gugus
85d9357e3a
Travel GUI
2012-10-06 17:52:46 +02: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
7ee038fdd7
fog now distance based instead of depth
2012-10-03 12:03:07 +02:00
Marc Zinnschlag
332039da10
Issue #61 : replaced 4 ingredient member variables with vector in alchemy GUI
2012-10-02 10:29:47 +02:00
Marc Zinnschlag
14833a4c3a
Issue #61 : More robust tools handling in alchemy window
2012-10-02 10:20:49 +02:00
Marc Zinnschlag
1cc2c2055f
Issue #61 : Implemented basic ingredient handling in Alchemy class
2012-10-02 10:20:26 +02:00
Marc Zinnschlag
6469933ce8
Merge branch 'master' into alchemy
...
Conflicts:
apps/openmw/mwgui/alchemywindow.cpp
2012-10-02 09:30:49 +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
61c84efa6c
Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation
2012-10-01 17:57:02 +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
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
gugus
4f5c4bf89a
Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwgui/dialogue.hpp
apps/openmw/mwgui/mode.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
2012-09-28 17:09:15 +02:00
gugus
4d496c1188
correction1
2012-09-28 17:02:27 +02:00
scrawl
044ab3d2b6
fix error in framelistener with tcg enabled
2012-09-28 17:02:18 +02:00
scrawl
636f297f10
enchant
2012-09-28 16:52:42 +02:00