36885b2e40
Issue #176 : removed enable/disable functions from Creature, Npc and Light
13 years ago
3ba24aee0d
Merge branch 'alchemy' into next
13 years ago
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
13 years ago
a3a22e9096
ingredient tooltip shows possible effects
13 years ago
76d71f86bc
fixed a faction case folding issue
13 years ago
4b5d6ce311
allow stacking gold
13 years ago
0f1e09d2c1
make Class::use method return an equip action for equippable items, add sound for equipping
13 years ago
e9ea1fba4e
fixed typo getCapacity method
13 years ago
0063387979
Merge branch 'master' into inventoryGUI
13 years ago
fdfddc8be7
some todo comment cleanup
13 years ago
7e00fea18b
added getEncumbrance function
13 years ago
c6493fb133
added getCapacity function
13 years ago
ab6336b745
using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now)
13 years ago
902309a554
working filters
13 years ago
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
5b0251b09f
item stacking
13 years ago
a31a9e51d3
add the sound for item drag&drop
13 years ago
d64fccec6f
display the item count in the tooltip
13 years ago
a1b86acc38
Merge branch 'master' into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
files/mygui/core.xml
13 years ago
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
ad5753ba91
Merge branch 'master' of https://github.com/zinnschlag/openmw into gui
13 years ago
9fc1138a87
opening, closing and taking books/scrolls works
13 years ago
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
13 years ago
22f524f8d5
potion effects in tooltip
13 years ago
b82c39c8be
renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be
...
reused for potion effects
13 years ago
f733382f74
tooltip now contains info about item enchantment
13 years ago
50d79a8815
Merge branch 'next' into tooltips
13 years ago
b1af18e98d
Merged next
13 years ago
af3ccd85e3
determine shield weight (tested with some light/medium/heavy shields)
13 years ago
5d4d35a02c
Merge branch 'master' into graphics
13 years ago
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
f4428097f9
removing more cout spam
13 years ago
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
13 years ago
d568b27b92
spell widget i18n improvements (used e.g. in birth menu)
13 years ago
1ce759af06
Merging in master
13 years ago
2e57cf5730
fixed the tooltip for doors leading to exteriors, fixed map window cell name
13 years ago
c2fdacc84f
show the creature name for soul gems (if any)
13 years ago
c044fadcc3
show weapon type & damage in the tooltip
13 years ago
cdd4d83d9e
moved the tooltip info to the appropriate MWWorld::Class classes
13 years ago
c4825cdb43
fixed gold pickup sound for international MW versions, fix npc tooltip
13 years ago
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
13 years ago
a38db39e88
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
13 years ago
b309d245c5
cleaning up hircine work
13 years ago
5d4ad4cd81
Shirts and Cuirasses
13 years ago
03d6d1fb82
NPC rank is correctly loaded now. Also corrected a potential bug (i think).
13 years ago
0553227ee1
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/player.cpp
apps/openmw/mwworld/player.hpp
13 years ago
74deb5588d
Post merge
13 years ago
290d09de64
Switching creature and npc to using the same id storage as the rest of the records
13 years ago
77604086e2
Merge branch 'autoequip'
13 years ago
ebab98a8a0
Restructuring things
13 years ago
d5a7d418dd
added getValue function to Class hierarchy
13 years ago
be4af711af
NPC rank was not loaded. Not sure if it's the right way, but it seems to work.
13 years ago
57299571d5
Preparing for clothes/armor
13 years ago
ae308b9b5f
Use a set of flags instead of separate booleans
13 years ago
b9fabce9c4
Awesome, working
13 years ago
18a139cd66
adding up and down move buttons
13 years ago
6f9d9c0f9e
another armour class detection fix
13 years ago
7ab20c3eb1
fixed armour class detection
13 years ago
c616d005e8
fixed a spelling mistake
13 years ago
947288e13a
Merge master and rewrite around the new detection function
13 years ago
db9085ae59
Pickup sounds for weapons
13 years ago
7c1475b723
Pickup sounds for potions, repair, gold, lights, rings
13 years ago
34e18df0fe
Pickup sounds for apparatus, books, clothes, ingredients, lockpicks, misc and probes
13 years ago
6dddf8a3d5
Pickup sounds for armors
13 years ago
cbbc295eb6
implemented new equipment functions in MWClass
13 years ago
703e484a92
Doors and Containers sounds, now in 3D
13 years ago
79158b9325
NPCs are using InventoryStore instead of ContainerStore from now on
13 years ago
fe977fe313
More container and door trap fixes
13 years ago
28fdfb0f99
Added container locked and trapped activation sounds
13 years ago
c6861ed2a9
Added door activation sounds
13 years ago
26bd2be1e8
Merge branch 'equipment' into next
13 years ago
af23cc352e
more cleanup
13 years ago
699246e54b
removed insertIntoContainer function from MWWorld::Class hierarchy
13 years ago
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
13 years ago
c471aa950f
re-enabled batching for statics; fixed a misplaced assert
13 years ago
ee02154805
lights without a mesh were not rendered
13 years ago
f2972b1ca0
turned ContainerStore from a template into a simple struct
13 years ago
8de6761a79
general cleanup
13 years ago
c081160591
replaced container store in ref data with new custom data implementation
13 years ago
b0256cea34
replaced movement settings in ref data with new custom data implementation
13 years ago
aa87bd4030
replaced creature stats in ref data with new custom data implementation
13 years ago
c6761e3470
replaced NPC stats in ref data with new custom data implementation
13 years ago
9b910dda94
clean up
13 years ago
7fde576dd9
actor physics again
13 years ago
a615369189
Warning and different physics
13 years ago
d855bb4fc6
physics reenabled
13 years ago
a6b88b48ec
A different way
13 years ago
7eee54bcd7
More physics and managing of Animation objects
13 years ago
1b835d6702
Cell changing fixes
13 years ago
0902a3db89
Filled out NpcAnimation and CreatureAnimation classes
13 years ago
5c48d8fc1e
more stuff
13 years ago
ee98a2af1a
Empty npcs
13 years ago
835c3f2603
Working towards npc rendering
13 years ago
7bd911b401
Problems with handles
13 years ago
16ff2a7a1b
Changing to Actors;NPCAnimation;CreatureAnimation
13 years ago
7319f7a8c6
Many bugs fixed related to changing cells
13 years ago
15fcdc8b72
Physics working
13 years ago
4dc59dfbdd
Scenenode flip
13 years ago
a0947cd432
Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed
13 years ago
db57f0a1a5
more corrections
13 years ago
bc58ef28cd
Made corrections
13 years ago
0b3bb2719f
Fixing some errors
13 years ago
c7dadec840
Updating the rest of mwclass
13 years ago
62d8d1add2
more recommended changes
13 years ago
f4e7bd6dfd
Made some recommended changes
13 years ago
042bceb547
Changes to insertObjectRendering; Proposed insertObject
13 years ago
1faa07b279
insertObjectRendering proposed
13 years ago
9aac625000
Changes to move the mutable ESM::Position data to RefData
13 years ago
8446619ac4
Merge branch 'components_namespaces' into next
...
Conflicts:
apps/openmw/mwrender/interior.cpp
components/bsa/bsa_archive.cpp
14 years ago
90985e849e
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/misc into Misc namespace.
Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
bc92b7b1fa
Merge branch 'directories' into next
...
Conflicts:
components/files/multidircollection.hpp
components/nifogre/ogre_nif_loader.hpp
14 years ago
0f2df4e2b8
more cleanup
14 years ago
56affd018a
Some cleanup
14 years ago
93f41e25a4
fs-strict
14 years ago
65cc0e8317
trying strict
14 years ago
3a9007849d
Windows fix
14 years ago
4d31ca2c86
Leading slashes now work, efficiency changes
14 years ago
45453fd7a9
Case insensitive external loader working
14 years ago
f2a0fa8af2
Adding files to directory map
14 years ago
2aaa0f4578
Backslash working in linux
14 years ago
b92955763a
Introducing Dir Archive
14 years ago
51b74c2f05
starting
14 years ago
7192bc4f89
added static flag
14 years ago
92509d3b70
Trying to animate creatures
14 years ago
7653caea27
Merge branch 'master' into collision
...
Conflicts:
apps/openmw/mwclass/npc.cpp
14 years ago
72ce493123
non-unique NPC ID workaround
14 years ago
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
14 years ago
9b606be4b8
fix direction bug
14 years ago
12db15d9a2
Reset arm position changed by commit 27f69d0f5b
14 years ago
d68141d203
Remove unused variables
14 years ago
151560b882
added missing run flag for NPCs
14 years ago
3cd1088695
crash bug fix
14 years ago
65232008a5
fixed a crash bug in NPC rendering
14 years ago
4468a2b6a8
added movement data to MW references; added movement interface to MWWorld::Class
14 years ago
88b0908104
adding physics when insertering objects into the OGRE scene
14 years ago
b48a5084be
added NPC stances
14 years ago
27f69d0f5b
Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp.
14 years ago
42ef7a61a0
Merge branch 'script'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/world.cpp
apps/openmw/mwworld/world.hpp
14 years ago
dd4d022301
Converted all tabs to four spaces
14 years ago
4a12be11bf
moved PlayerPos class from MWRender to MWWorld and renamed it to Player
14 years ago
f3ae1ea737
NPC leg appearance changed
14 years ago
ba168b22e9
cleanupandupdate
14 years ago
11406ae6f3
cleanupandupdate
14 years ago
60601682cd
Beast races fixed
14 years ago
1896a6a2e8
Preliminary npcs4
14 years ago
467988455c
Preliminary npcs3
14 years ago
dfe20033ea
Preliminary npcs2
14 years ago
be8f852663
implemented skill value handling during character creation (untested)
15 years ago
2527fe92a7
implemented creature/NPC level
15 years ago
1dc805d0d4
Merge branch 'master' into exterior
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
15 years ago
61c4fa0630
blocked using of locked doors (keys are not considered yet)
15 years ago
459dd82896
implemented locking/unlocking for doors (can not be invoked by user interaction yet)
15 years ago
7bb2041418
made rendering more robust (no more crashes, even if Ogre throws an exception)
15 years ago
67a067e49c
changed name of teleport doors to the name of the destination cell
15 years ago
3b49d6c826
added NPC stats
15 years ago
6258654383
fixed a very sloppy merge
15 years ago
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
6f28bd9adf
handle sounds when enabling/disabling
15 years ago
d57c984517
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
15 years ago
967f85875d
reimplemented class-dependend rendering code in MWClass
15 years ago
2acfe22975
added test for actor ID
15 years ago
8086933282
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
15 years ago
7afc8ffd2e
Merge branch 'container'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
15 years ago
a7fe28ecbe
implemented take action
15 years ago
0a60bde834
added insertIntoContainer function to class hierarchy
15 years ago
d42747e85b
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
15 years ago
09c42589cc
implemented npc/creature activation (enters dialog gui mode for now)
15 years ago
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
7a313f24ab
integrated activation into script system
15 years ago
ee7570f7e7
added containerstore
15 years ago
002345270b
implemented teleport doors (only for the player for now)
15 years ago
239498bcd4
added getName function
15 years ago
f50ced4616
added missing record classes
15 years ago
bfc282779b
added item health interface
15 years ago
93754b2851
moved some includes around
15 years ago
33b6a0b800
moved concrete record classes to separate sub-system (mwclass)
15 years ago
9d6e658e05
previous commit was missing some files
15 years ago
Marc Zinnschlag
scrawl
gugus
Alexander "Ace" Olofsson
Jason Hooks
Chris Robinson
Michael Papageorgiou
Jason Hooks
Jacob Essex
Lukasz Gromanowski
Jason Hooks
Jan-Peter Nilsson
athile
Pieter van der Kloet