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 |
Glorf
|
50932a7a6b
|
Finished bugfix #691
|
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 |
scrawl
|
43cdbd033d
|
Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips
|
12 years ago |
Glorf
|
d29a42dcbe
|
Fixed enchanting mechanics
|
12 years ago |
Marc Zinnschlag
|
573368849b
|
Merge remote-tracking branch 'glorf/enchanting'
Conflicts:
apps/openmw/CMakeLists.txt
|
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
|
78f3f19f62
|
Thrown weapons, arrows and bolts shouldn't have item health
|
12 years ago |
scrawl
|
8e2f9f5186
|
Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips
|
12 years ago |
scrawl
|
c0b0227e8a
|
enchanting
|
12 years ago |
scrawl
|
84afd87321
|
Placeable objects should not collide unless they have a NiRootCollisionNode
|
12 years ago |
scrawl
|
00db13be32
|
Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.
|
12 years ago |
Marc Zinnschlag
|
918316168f
|
Merge remote-tracking branch 'greye/store' into next
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
|
12 years ago |
emoose
|
7a7825577a
|
Changed: use MWWorld::Ptr for PhysicsSystem arguments
|
12 years ago |
greye
|
bd1bb2e55d
|
applying new interface vol.1, inconsistent
|
12 years ago |
greye
|
d205723a17
|
resolving m prefix/ESMStore movement
|
12 years ago |
greye
|
2057f5619e
|
move ESMStore to MWWorld
|
12 years ago |
greye
|
3c2ce25f5f
|
m prefix for mwworld/cellstore.hpp
|
12 years ago |
greye
|
2fa4ac177a
|
initial resolving
|
12 years ago |
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
12 years ago |
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
12 years ago |
Douglas Diniz
|
82e7c04c0a
|
Changing sounds to Action.
Adding onActor to Action to choose between playSound and playSound3D.
|
13 years ago |
Marc Zinnschlag
|
6534c2a55a
|
Issue #107: WindowManager is accessed only through the interface class from now on
|
13 years ago |
Marc Zinnschlag
|
6bd48d12af
|
Issue #107: SoundManager is accessed only through the interface class from now on
|
13 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 |
Marc Zinnschlag
|
5a7b95bf7a
|
Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp
|
13 years ago |
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
13 years ago |
Marc Zinnschlag
|
7fcd41c69d
|
Issue #107: Detemplateised CellStore; some include cleanup
|
13 years ago |
Marc Zinnschlag
|
76174098c7
|
Issue #107: CellStore moved from ESMS to MWWorld
|
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 |
scrawl
|
d64fccec6f
|
display the item count in the tooltip
|
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
|
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 |