Commit Graph

2969 Commits (e80394c0b57652b95d6899de361a96ef2aaef646)

Author SHA1 Message Date
scrawl e80394c0b5 fix training limit 12 years ago
scrawl 125315ebe7 remove a cout 12 years ago
scrawl c64eb96952 Merge branch 'Travel_Dialogue' into training_travel
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt
12 years ago
scrawl 1a2034b4dd training window 12 years ago
scrawl 7d1e659960 fading, greying out destinations you cant afford, warning fix 12 years ago
gugus 9583a1b8e9 FadeOut/In, that's for you scrawl! 12 years ago
gugus c9afe222be traveling now takes time 12 years ago
Marc Zinnschlag e05e683da3 Merge remote-tracking branch 'scrawl/spellcreation' 12 years ago
scrawl f154031e54 last bits of the gui 12 years ago
Marc Zinnschlag b2025b9209 Merge branch 'pedantic' 12 years ago
cfcohen e4a61486c8 Removed minor comments left in by accident. 12 years ago
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.
12 years ago
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.
12 years ago
Marc Zinnschlag 35d099a638 disabling gcc extensions 12 years ago
cfcohen 57f3b50dc8 Add more detail to ESMTool record dumping. 12 years ago
gugus 27a3487d78 right prices 12 years ago
gugus 5a611b66d7 traveling. 12 years ago
gugus 85d9357e3a Travel GUI 12 years ago
scrawl 025e820703 abstracted code and use it in enchanting window as well 12 years ago
scrawl 1c0dd3ccc5 some editing code 12 years ago
scrawl 21493c2dbd added magic effect flags from Research wiki page 12 years ago
scrawl 63fd8172d8 Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation 12 years ago
scrawl fa358ab196 change the inventory preview to "inventoryhandtohand" animation pose 12 years ago
scrawl ff2c2d2b96 Merge branch 'master' into spellcreation
Conflicts:
	apps/openmw/mwbase/windowmanager.hpp
12 years ago
Marc Zinnschlag d1c4559abe fixed GMST string handling in GUI 12 years ago
Marc Zinnschlag 35d7b5e5b0 Merge remote-tracking branch 'greye/record_saving' 12 years ago
Marc Zinnschlag 29633bd02f Merge remote-tracking branch 'greye/master' 12 years ago
greye f907a6a86f updateListener() every frame 12 years ago
Chris Robinson 6c5c9ce46e Avoid console spam when a sound can't play 12 years ago
Chris Robinson 6942fa97da Specify a proper up vector for the listener 12 years ago
Chris Robinson 991f942fba Merge remote-tracking branch 'zini/master' into sound
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.cpp
	apps/openmw/mwsound/soundmanagerimp.hpp
12 years ago
greye 2fa4ac177a initial resolving 12 years ago
greye 721324c1db rm record inheritance, rework esmtool accordingly 12 years ago
Marc Zinnschlag 20a263738a Merge remote-tracking branch 'chris/animation' 12 years ago
Chris Robinson 41f80908d9 Simplify getting the stop time when playing all animation groups 12 years ago
Marc Zinnschlag 2ab96d0108 Merge remote-tracking branch 'scrawl/next' 12 years ago
scrawl 0c6ad13364 WakeUpPc instruction 12 years ago
Chris Robinson cd8515396a Use a multimap to store the text keys 12 years ago
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
12 years ago
gugus 4d496c1188 correction1 12 years ago
scrawl 044ab3d2b6 fix error in framelistener with tcg enabled 12 years ago
gugus 1971ba66f1 destination name is now OK for every trave services 12 years ago
scrawl ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
	apps/openmw/mwgui/dialogue.cpp
12 years ago
scrawl 9b0254a158 small map fix 12 years ago
Marc Zinnschlag bb6d9a329c Merge remote-tracking branch 'scrawl/book_skillgain' into next 12 years ago
gugus 3060fbee60 TravelGUI, not completly finished. 12 years ago
scrawl 71d04e16da fix the global map updating when pinned 12 years ago
scrawl caef570c8a fix the weather not changing when sleeping/waiting 12 years ago
scrawl 359824d614 oops 12 years ago
scrawl 4453459378 re-use the texture across preview instances 12 years ago