Marc Zinnschlag
|
6469933ce8
|
Merge branch 'master' into alchemy
Conflicts:
apps/openmw/mwgui/alchemywindow.cpp
|
12 years ago |
|
Marc Zinnschlag
|
10c8360e07
|
Issue #61: Replaced apparatus handling in alchemy GUI with new implementation in Alchemy class
|
12 years ago |
|
Marc Zinnschlag
|
cd343c4fbd
|
Issue #61: Basic alchemy class (doesn't do anything yet)
|
12 years ago |
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
12 years ago |
scrawl
|
bc6a1979b0
|
replaced everything with the new method
|
12 years ago |
|
scrawl
|
35dd49f948
|
fixed some "using namespace" in headers
|
12 years ago |
|
Marc Zinnschlag
|
6534c2a55a
|
Issue #107: WindowManager is accessed only through the interface class from now on
|
13 years ago |
|
Marc Zinnschlag
|
6bd48d12af
|
Issue #107: SoundManager is accessed only through the interface class from now on
|
13 years ago |
|
Marc Zinnschlag
|
cc7c6aa0ad
|
Merge branch 'decouple'
|
13 years ago |
|
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
13 years ago |
|
scrawl
|
d27863bf8e
|
rename layout files to .layout to get them recognized by layout editor
|
13 years ago |
|
Marc Zinnschlag
|
7fcd41c69d
|
Issue #107: Detemplateised CellStore; some include cleanup
|
13 years ago |
|
Marc Zinnschlag
|
76174098c7
|
Issue #107: CellStore moved from ESMS to MWWorld
|
13 years ago |
|
scrawl
|
15e959868c
|
make some of the gui mode changes a bit safer
|
13 years ago |
|
scrawl
|
6945afe95b
|
alchemy window layout
|
13 years ago |
|
scrawl
|
f1d3978897
|
Issue #290: Auto-Close MW-reference related GUI windows
|
13 years ago |
|
scrawl
|
750259973e
|
potion creating works, most of the values are bogus
|
13 years ago |
|
scrawl
|
63b3b82657
|
don't allow more than 4 potion effects
|
13 years ago |
|
scrawl
|
1df1b521a4
|
show the list of potion effects
|
13 years ago |
|
scrawl
|
6eb15f7680
|
auto-select the alchemy tools with highest quality
|
13 years ago |
|
scrawl
|
09c870ad68
|
first alchemy window layout (not pretty)
|
13 years ago |
|
scrawl
|
51b8a76a68
|
merged by branches together, starting with alchemy window
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
|
13 years ago |