scrawl
|
3a6fde5039
|
cleanup 2
|
13 years ago |
scrawl
|
a1b86acc38
|
Merge branch 'master' into inventoryGUI
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
files/mygui/core.xml
|
13 years ago |
scrawl
|
007a202deb
|
cleanup 1
|
13 years ago |
scrawl
|
2d3cc014c9
|
Merge branch 'inventoryGUI' of https://github.com/gugus/openmw into inventoryGUI
Conflicts:
apps/openmw/mwgui/container.cpp
apps/openmw/mwgui/container.hpp
|
13 years ago |
gugus
|
cfb7aa4343
|
Drag and drop works. There is a bug with item count when doing d&d. Clean-up time :p
|
13 years ago |
gugus
|
9dd65dce30
|
Finished merging.
|
13 years ago |
gugus
|
8e8f80807e
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/armor.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/clothing.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/light.cpp
apps/openmw/mwclass/lockpick.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/probe.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwclass/weapon.cpp
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
apps/openmw/mwworld/class.cpp
|
13 years ago |
Marc Zinnschlag
|
37095b62c6
|
removed another include
|
13 years ago |
Marc Zinnschlag
|
e906614170
|
Merge remote branch 'scrawl/gui'
|
13 years ago |
scrawl
|
3d9e89c837
|
removed unnecessary include
|
13 years ago |
Marc Zinnschlag
|
bee03b5180
|
Merge remote branch 'scrawl/gui'
|
13 years ago |
scrawl
|
4ce50c503b
|
a few tweaks
|
13 years ago |
scrawl
|
de995e3a69
|
adjust topic list on window resize
|
13 years ago |
scrawl
|
8a9e05a96b
|
display text on the book window
|
13 years ago |
scrawl
|
d69501b061
|
change daedric font to .zip resource
|
13 years ago |
scrawl
|
e5e8663bb4
|
parse <div> <font> and <p>
|
13 years ago |
scrawl
|
8e7ab09a25
|
scroll window image tags working
|
13 years ago |
gugus
|
e9134717d6
|
the GUI part of drag and drop is working
|
13 years ago |
scrawl
|
cd351ba3af
|
simple scroll text parsing (tags are ignored until now)
|
13 years ago |
scrawl
|
2b584300d6
|
throw an exception when no default settings file is found, which indicates a packaging error
|
13 years ago |
scrawl
|
3c69d26571
|
journal close sound
|
13 years ago |
scrawl
|
9dd53b32b8
|
added daedric font for magic scrolls
|
13 years ago |
gugus
|
60ad6f01d4
|
another step towards drand and drop.
|
13 years ago |
scrawl
|
f20d4eeb41
|
Bug #281 , openmw.font.xml update
|
13 years ago |
scrawl
|
d91129ed49
|
Merge branch 'master' into gui
|
13 years ago |
scrawl
|
499dd26398
|
dialogue window topic list word-wrapping
|
13 years ago |
Marc Zinnschlag
|
c227e4127c
|
Merge remote branch 'scrawl/tooltips'
|
13 years ago |
scrawl
|
12453d4e9d
|
Merge branch 'master' into gui
|
13 years ago |
scrawl
|
a3d99767f7
|
next & prev button mouseover
|
13 years ago |
scrawl
|
c125fba9d2
|
button mouse-over image change working
|
13 years ago |
scrawl
|
a4d6d1baff
|
added a utility for creating texture atlas at runtime
|
13 years ago |
Marc Zinnschlag
|
e26f39e563
|
fixed exception handling during subsystem setup
|
13 years ago |
scrawl
|
4ddd24fdfc
|
Merge branch 'master' into tooltips
|
13 years ago |
scrawl
|
ad5753ba91
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into gui
|
13 years ago |
Marc Zinnschlag
|
1149e282b8
|
Merge remote branch 'scrawl/physicsaedra2'
|
13 years ago |
Marc Zinnschlag
|
e9f1c266bf
|
Merge remote branch 'scrawl/creaturedialogue'
|
13 years ago |
scrawl
|
b653f047ac
|
removed a file that wasn't supposed to be there
|
13 years ago |
scrawl
|
5028a83d11
|
fix stats window layout resizing
|
13 years ago |
scrawl
|
dc378fc6cf
|
allow talking with creatures
|
13 years ago |
scrawl
|
9fc1138a87
|
opening, closing and taking books/scrolls works
|
13 years ago |
scrawl
|
0e6b82284f
|
book & scroll windows
|
13 years ago |
scrawl
|
c0e12d0e56
|
class dialog fix
|
13 years ago |
scrawl
|
387792bb57
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into physicsaedra2
|
13 years ago |
scrawl
|
c4b63bdb2f
|
.gitmodules
|
13 years ago |
Chris Robinson
|
144d52cf49
|
Add voices to the chargen class questions
|
13 years ago |
scrawl
|
dd8c66b479
|
notification when screenshot was taken
|
13 years ago |
scrawl
|
e4b057be30
|
translated journal notification
|
13 years ago |
scrawl
|
04ead5eb42
|
make the no-clip mode move much faster
|
13 years ago |
scrawl
|
6850f3945c
|
disable those physics debug prints
|
13 years ago |
scrawl
|
a13f542396
|
disable snapping underwater
|
13 years ago |