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
|
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
|
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
|
d5a7d418dd
|
added getValue function to Class hierarchy
|
2012-04-07 19:53:49 +02:00 |
|
Michael Papageorgiou
|
947288e13a
|
Merge master and rewrite around the new detection function
|
2012-03-14 00:38:44 +02:00 |
|
Michael Papageorgiou
|
7c1475b723
|
Pickup sounds for potions, repair, gold, lights, rings
|
2012-03-13 20:01:55 +02: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
|
bc58ef28cd
|
Made corrections
|
2011-11-12 15:58:22 -05:00 |
|
Jason Hooks
|
c7dadec840
|
Updating the rest of mwclass
|
2011-11-11 23:01:12 -05: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
|
f50ced4616
|
added missing record classes
|
2010-08-03 15:24:44 +02:00 |
|