Commit Graph

45 Commits (celladd)

Author SHA1 Message Date
scrawl 41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 10 years ago
Marc Zinnschlag 4fb897f2f8 added missing getId functions to classes derived from MWWorld::Class 11 years ago
scrawl a05c8fd3ce Make applyEnchantment return the record ID instead of modifying Ptr 11 years ago
scrawl 190512156d Use some more GMSTs for enchanting 11 years ago
scrawl 0c4a963132 Container UI rewrite 12 years ago
scrawl 78596cad83 Fix enchantment points value 12 years ago
scrawl 2693b78536 Add initial player inventory when new game is started 12 years ago
Marc Zinnschlag beb1858a57 Merge remote-tracking branch 'glorf/bugfix' 12 years ago
Glorf ad49d1ecab Sixth minor fix 12 years ago
Glorf 7c22e123f4 Bugfix #691 changes 12 years ago
scrawl f3c8cd2065 Don't buy/sell keys which are set to open a lock 12 years ago
Glorf 48d9885554 Started bugfix #691 12 years ago
Glorf d29a42dcbe Fixed enchanting mechanics 12 years ago
Glorf 86275e5bd4 Some enchanting fixes 12 years ago
Glorf eb88463b94 Some enchanting fixes 12 years ago
Glorf 6643fe789c Enchanting system 12 years ago
scrawl c0b0227e8a enchanting 12 years ago
greye 26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 13 years ago
greye e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 13 years ago
greye 6a3a728a56 Class::getModel implementation 13 years ago
scrawl 0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping 13 years ago
scrawl 6ee4e8fb5a Merge branch 'itemstacking' into inventoryGUI
Conflicts:
	apps/openmw/mwclass/armor.hpp
	apps/openmw/mwclass/clothing.hpp
	apps/openmw/mwclass/weapon.hpp
	apps/openmw/mwworld/class.hpp
13 years ago
scrawl 5b0251b09f item stacking 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
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 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 d5a7d418dd added getValue function to Class hierarchy 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 34e18df0fe Pickup sounds for apparatus, books, clothes, ingredients, lockpicks, misc and probes 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 bc58ef28cd Made corrections 13 years ago
Jason Hooks c7dadec840 Updating the rest of mwclass 13 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 f50ced4616 added missing record classes 15 years ago