1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Commit graph

33 commits

Author SHA1 Message Date
scrawl
d64fccec6f display the item count in the tooltip 2012-05-12 13:46:03 +02:00
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
2012-05-11 10:40:40 +02:00
scrawl
f733382f74 tooltip now contains info about item enchantment 2012-04-30 00:57:41 +02:00
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
2012-04-24 02:02:03 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
scrawl
d568b27b92 spell widget i18n improvements (used e.g. in birth menu) 2012-04-18 16:53:56 +02:00
scrawl
c044fadcc3 show weapon type & damage in the tooltip 2012-04-17 15:31:16 +02:00
scrawl
cdd4d83d9e moved the tooltip info to the appropriate MWWorld::Class classes 2012-04-16 22:58:16 +02:00
gugus
a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
2012-04-15 17:54:13 +02:00
gugus
b309d245c5 cleaning up hircine work 2012-04-15 17:52:39 +02:00
Marc Zinnschlag
77604086e2 Merge branch 'autoequip' 2012-04-08 13:01:25 +02:00
Marc Zinnschlag
d5a7d418dd added getValue function to Class hierarchy 2012-04-07 19:53:49 +02:00
Chris Robinson
ae308b9b5f Use a set of flags instead of separate booleans 2012-03-31 07:31:55 -07:00
Marc Zinnschlag
c616d005e8 fixed a spelling mistake 2012-03-15 14:31:16 +01:00
Michael Papageorgiou
947288e13a Merge master and rewrite around the new detection function 2012-03-14 00:38:44 +02:00
Michael Papageorgiou
db9085ae59 Pickup sounds for weapons 2012-03-13 20:40:30 +02:00
Marc Zinnschlag
cbbc295eb6 implemented new equipment functions in MWClass 2012-03-13 15:35:06 +01:00
Marc Zinnschlag
699246e54b removed insertIntoContainer function from MWWorld::Class hierarchy 2012-02-23 12:53:48 +01:00
Marc Zinnschlag
f2972b1ca0 turned ContainerStore from a template into a simple struct 2012-01-28 11:45:55 +01:00
Marc Zinnschlag
8de6761a79 general cleanup 2012-01-27 15:11:02 +01:00
Jason Hooks
7319f7a8c6 Many bugs fixed related to changing cells 2011-11-19 01:01:19 -05:00
Jason Hooks
15fcdc8b72 Physics working 2011-11-17 19:38:52 -05:00
Jason Hooks
4dc59dfbdd Scenenode flip 2011-11-17 17:10:27 -05:00
Jason Hooks
c7dadec840 Updating the rest of mwclass 2011-11-11 23:01:12 -05:00
Jacob Essex
9aac625000 Changes to move the mutable ESM::Position data to RefData 2011-11-08 00:08:00 +00:00
Marc Zinnschlag
88b0908104 adding physics when insertering objects into the OGRE scene 2011-01-29 17:33:48 +01:00
Marc Zinnschlag
7bb2041418 made rendering more robust (no more crashes, even if Ogre throws an exception) 2010-08-25 09:43:06 +02:00
Marc Zinnschlag
967f85875d reimplemented class-dependend rendering code in MWClass 2010-08-14 10:02:54 +02:00
Marc Zinnschlag
a7fe28ecbe implemented take action 2010-08-07 20:25:17 +02:00
Marc Zinnschlag
0a60bde834 added insertIntoContainer function to class hierarchy 2010-08-06 22:20:20 +02:00
Marc Zinnschlag
7a313f24ab integrated activation into script system 2010-08-05 15:40:03 +02:00
Marc Zinnschlag
239498bcd4 added getName function 2010-08-03 17:11:41 +02:00
Marc Zinnschlag
bfc282779b added item health interface 2010-08-03 14:14:04 +02:00