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 |
scrawl
|
f733382f74
|
tooltip now contains info about item enchantment
|
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 |
Marc Zinnschlag
|
35f478071e
|
Issue #255: deleted the old environment class and using the new one instead
|
13 years ago |
|
scrawl
|
d568b27b92
|
spell widget i18n improvements (used e.g. in birth menu)
|
13 years ago |
|
scrawl
|
c044fadcc3
|
show weapon type & damage in the tooltip
|
13 years ago |
|
scrawl
|
cdd4d83d9e
|
moved the tooltip info to the appropriate MWWorld::Class classes
|
13 years ago |
|
gugus
|
a38db39e88
|
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
apps/openmw/CMakeLists.txt
|
13 years ago |
|
gugus
|
b309d245c5
|
cleaning up hircine work
|
13 years ago |
|
Marc Zinnschlag
|
77604086e2
|
Merge branch 'autoequip'
|
13 years ago |
|
Marc Zinnschlag
|
d5a7d418dd
|
added getValue function to Class hierarchy
|
13 years ago |
Chris Robinson
|
ae308b9b5f
|
Use a set of flags instead of separate booleans
|
13 years ago |
|
Marc Zinnschlag
|
c616d005e8
|
fixed a spelling mistake
|
13 years ago |
Michael Papageorgiou
|
947288e13a
|
Merge master and rewrite around the new detection function
|
13 years ago |
|
Michael Papageorgiou
|
db9085ae59
|
Pickup sounds for weapons
|
13 years ago |
|
Marc Zinnschlag
|
cbbc295eb6
|
implemented new equipment functions in MWClass
|
13 years ago |
|
Marc Zinnschlag
|
699246e54b
|
removed insertIntoContainer function from MWWorld::Class hierarchy
|
13 years ago |
|
Marc Zinnschlag
|
f2972b1ca0
|
turned ContainerStore from a template into a simple struct
|
13 years ago |
|
Marc Zinnschlag
|
8de6761a79
|
general cleanup
|
13 years ago |
Jason Hooks
|
7319f7a8c6
|
Many bugs fixed related to changing cells
|
13 years ago |
|
Jason Hooks
|
15fcdc8b72
|
Physics working
|
13 years ago |
|
Jason Hooks
|
4dc59dfbdd
|
Scenenode flip
|
13 years ago |
|
Jason Hooks
|
c7dadec840
|
Updating the rest of mwclass
|
13 years ago |
Jacob Essex
|
9aac625000
|
Changes to move the mutable ESM::Position data to RefData
|
13 years ago |
|
Marc Zinnschlag
|
88b0908104
|
adding physics when insertering objects into the OGRE scene
|
14 years ago |
|
Marc Zinnschlag
|
7bb2041418
|
made rendering more robust (no more crashes, even if Ogre throws an exception)
|
15 years ago |
|
Marc Zinnschlag
|
967f85875d
|
reimplemented class-dependend rendering code in MWClass
|
15 years ago |
|
Marc Zinnschlag
|
a7fe28ecbe
|
implemented take action
|
15 years ago |
|
Marc Zinnschlag
|
0a60bde834
|
added insertIntoContainer function to class hierarchy
|
15 years ago |
|
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
15 years ago |
|
Marc Zinnschlag
|
239498bcd4
|
added getName function
|
15 years ago |
|
Marc Zinnschlag
|
bfc282779b
|
added item health interface
|
15 years ago |