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 |
gugus
|
e9134717d6
|
the GUI part of drag and drop is working
|
13 years ago |
scrawl
|
2b584300d6
|
throw an exception when no default settings file is found, which indicates a packaging error
|
13 years ago |
gugus
|
60ad6f01d4
|
another step towards drand and drop.
|
13 years ago |
Marc Zinnschlag
|
c227e4127c
|
Merge remote branch 'scrawl/tooltips'
|
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 |
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
|
dc378fc6cf
|
allow talking with creatures
|
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
|
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 |
scrawl
|
7f15385dc5
|
unrelated cleanup
|
13 years ago |
scrawl
|
6acb777c5a
|
minimum framerate fix
|
13 years ago |
Chris Robinson
|
b3caf82714
|
Avoid using vector<>::data(), which requires C++11
|
13 years ago |
Chris Robinson
|
8c4f78cc05
|
Merge remote branch 'zini/master' into sound
|
13 years ago |
scrawl
|
86b6184f43
|
pMove in a seperate loop with fixed timestep to prevent frame-dependent movement
|
13 years ago |
scrawl
|
bd132074af
|
some formatting tweaks
|
13 years ago |
scrawl
|
48e3c43823
|
added the bloodmoon/tribunal spells
|
13 years ago |
scrawl
|
6d21fe3115
|
fixed mygui leaking some stuff resulting in lower fps after looking at tooltips and low-quality text
|
13 years ago |
scrawl
|
4655ec94f0
|
Merge branch 'master' into physicsaedra2 & fix warnings
Conflicts:
apps/openmw/mwworld/scene.cpp
|
13 years ago |
scrawl
|
cc365c5bcb
|
Merge branch 'master' into tooltips
|
13 years ago |
scrawl
|
fc06dc72c9
|
small fix
|
13 years ago |
scrawl
|
ea275a8aa8
|
extended the list of spells with no magnitude / no duration
|
13 years ago |
gugus
|
5f8c08b18b
|
some work for dropping objects.
|
13 years ago |
Marc Zinnschlag
|
53e77d4196
|
Merge remote branch 'scrawl/tooltips' into next
|
13 years ago |
scrawl
|
2f0a69160c
|
small fix
|
13 years ago |
scrawl
|
22f524f8d5
|
potion effects in tooltip
|
13 years ago |
scrawl
|
b82c39c8be
|
renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be
reused for potion effects
|
13 years ago |
scrawl
|
f733382f74
|
tooltip now contains info about item enchantment
|
13 years ago |
scrawl
|
397a978145
|
DispositionEdit tweaks
|
13 years ago |
scrawl
|
eca18f3e1d
|
dialogue topic and choice sorting independent of case
|
13 years ago |
scrawl
|
cca39978d4
|
changed messagebox text colors
|
13 years ago |
scrawl
|
50d79a8815
|
Merge branch 'next' into tooltips
|
13 years ago |
scrawl
|
af3ccd85e3
|
determine shield weight (tested with some light/medium/heavy shields)
|
13 years ago |
Marc Zinnschlag
|
d1d21c8a0e
|
compile fix
|
13 years ago |
scrawl
|
5d4d35a02c
|
Merge branch 'master' into graphics
|
13 years ago |
scrawl
|
4ce83badc9
|
flickering lights
|
13 years ago |
gugus
|
5603cb312c
|
Objects can now be selected and follow mouse movements.
|
13 years ago |
gugus
|
a6419c3596
|
Clicking on an item is now detected.
Trying to have items follow the mouse position, but it doesn't work yet.
|
13 years ago |
Chris Robinson
|
2f1fee4b83
|
Merge remote branch 'zini/next' into sound
|
13 years ago |
Marc Zinnschlag
|
d5e52e46ea
|
removing even more cout spam (thanks to scrawl for finding this one)
|
13 years ago |
scrawl
|
1b5bfc52a1
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
|
13 years ago |
scrawl
|
e443455612
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
|
13 years ago |
Marc Zinnschlag
|
f4428097f9
|
removing more cout spam
|
13 years ago |