scrawl
|
e9ea1fba4e
|
fixed typo getCapacity method
|
13 years ago |
scrawl
|
0063387979
|
Merge branch 'master' into inventoryGUI
|
13 years ago |
Marc Zinnschlag
|
7e00fea18b
|
added getEncumbrance function
|
13 years ago |
Marc Zinnschlag
|
c6493fb133
|
added getCapacity function
|
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 |
scrawl
|
282f37b1b7
|
fix compilation
|
13 years ago |
scrawl
|
53b48196f9
|
add interface for tooltips to MWWorld::Class
|
13 years ago |
gugus
|
58d05fa503
|
more clean-up. Container window shows up! But there is no working close button.
|
13 years ago |
Marc Zinnschlag
|
5e9d209b21
|
Merge remote branch 'minty3/testbranch'
|
13 years ago |
Aleksandar Jovanov
|
db928dcb2f
|
put an opening bracket on a new line
|
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
|
6dddf8a3d5
|
Pickup sounds for armors
|
13 years ago |
Marc Zinnschlag
|
c314cddb1c
|
added getEquipmentSkill function to Class hierarchy
|
13 years ago |
Marc Zinnschlag
|
4b73116b9d
|
added getEquipmentSlots function to MWWorld::Class hierarchy
|
13 years ago |
Marc Zinnschlag
|
79158b9325
|
NPCs are using InventoryStore instead of ContainerStore from now on
|
13 years ago |
Marc Zinnschlag
|
699246e54b
|
removed insertIntoContainer function from MWWorld::Class hierarchy
|
13 years ago |
Marc Zinnschlag
|
4a16553acc
|
replaced an include with a forward declaration
|
13 years ago |
Marc Zinnschlag
|
f2972b1ca0
|
turned ContainerStore from a template into a simple struct
|
13 years ago |
Jason Hooks
|
f4e7bd6dfd
|
Made some recommended changes
|
13 years ago |
Jason Hooks
|
042bceb547
|
Changes to insertObjectRendering; Proposed insertObject
|
13 years ago |
Jason Hooks
|
1faa07b279
|
insertObjectRendering proposed
|
13 years ago |
Marc Zinnschlag
|
4468a2b6a8
|
added movement data to MW references; added movement interface to MWWorld::Class
|
14 years ago |
Marc Zinnschlag
|
b48a5084be
|
added NPC stances
|
14 years ago |
Marc Zinnschlag
|
459dd82896
|
implemented locking/unlocking for doors (can not be invoked by user interaction yet)
|
15 years ago |
Marc Zinnschlag
|
3b49d6c826
|
added NPC stats
|
15 years ago |
Marc Zinnschlag
|
2cfe5f0697
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
|
15 years ago |
Marc Zinnschlag
|
d57c984517
|
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
|
15 years ago |
Marc Zinnschlag
|
de2eeb4cde
|
integrated insertObject function into class hierarchy
|
15 years ago |
Marc Zinnschlag
|
2acfe22975
|
added test for actor ID
|
15 years ago |
Marc Zinnschlag
|
0a60bde834
|
added insertIntoContainer function to class hierarchy
|
15 years ago |
Marc Zinnschlag
|
10a63b10b5
|
Merge branch 'master' into container
Conflicts:
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/container.hpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
|
15 years ago |
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
15 years ago |
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
15 years ago |
Marc Zinnschlag
|
002345270b
|
implemented teleport doors (only for the player for now)
|
15 years ago |
Marc Zinnschlag
|
7e5ddae3b3
|
modified action interface to allow other actors besides the player
|
15 years ago |
Marc Zinnschlag
|
c38b02bd5c
|
added action interface
|
15 years ago |
Marc Zinnschlag
|
bfc282779b
|
added item health interface
|
15 years ago |
Marc Zinnschlag
|
ca842d1b4d
|
reimplemented access to creature stats via new class interface
|
15 years ago |
Marc Zinnschlag
|
a70c3876a2
|
added foundation for esm record class hierarchy
|
15 years ago |