scrawl
|
14c9a4e1d3
|
Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.
|
2013-11-23 23:12:54 +01:00 |
|
scrawl
|
b6c22ad5d9
|
Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.
|
2013-11-21 17:19:30 +01:00 |
|
scrawl
|
74e42a2d02
|
Add missing skill increases for Enchant skill
|
2013-11-19 07:39:07 +01:00 |
|
scrawl
|
0dc2e829dd
|
Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.
|
2013-11-17 23:31:08 +01:00 |
|
scrawl
|
b1a29eb27e
|
Implement Resist & Weakness effects
|
2013-11-16 02:34:43 +01:00 |
|
scrawl
|
992a8e9c36
|
Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.
|
2013-11-14 14:41:10 +01:00 |
|
scrawl
|
9b0e82a37f
|
Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)
|
2013-11-13 14:02:15 +01:00 |
|
scrawl
|
0dab7031c0
|
Make sure effects are destroyed with the animation
|
2013-11-12 02:22:44 +01:00 |
|
scrawl
|
eccb8f38ba
|
Apply "cast when strikes" enchantments when hitting with a weapon
|
2013-11-12 02:07:51 +01:00 |
|
Marc Zinnschlag
|
458c752425
|
Merge remote-tracking branch 'mckibbenta/tgm'
|
2013-10-12 13:38:10 +02:00 |
|
Emanuel Guevel
|
4860514865
|
Acrobatics: cosmetic changes
|
2013-10-02 23:34:24 +02:00 |
|
mckibbenta
|
073f64c8bb
|
stop weapon condition degredation (for the player) with tgm on
|
2013-10-02 13:46:33 -04:00 |
|
Emanuel Guevel
|
b8c60dabb3
|
Reintroduce Acrobatics changes made by Glorf
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
|
2013-10-01 23:35:34 +02:00 |
|
Chris Robinson
|
f5d03a16c1
|
Rename getFacedObject and getFacedHandle for melee hits
|
2013-08-23 12:27:39 -07:00 |
|
scrawl
|
22d5598082
|
Fix bad_cast exception when hitting creatures
|
2013-08-22 12:17:12 +02:00 |
|
Chris Robinson
|
dca599b8c5
|
Add NPC landing sounds for soundgen keys
|
2013-08-19 08:58:50 -07:00 |
|
Chris Robinson
|
6fd4cdb5fb
|
Play randomized werewolf sounds
|
2013-08-11 00:53:17 -07:00 |
|
Chris Robinson
|
00d6690b4d
|
Ignore encumbrance in werewolf form
According to UESP, inventory weight is ignored. Not sure if this
includes feather and burden effects.
|
2013-08-10 20:25:18 -07:00 |
|
Chris Robinson
|
c2d8eb377f
|
Play some appropriate sounds in werewolf form
|
2013-08-09 06:40:16 -07:00 |
|
Chris Robinson
|
46bc7bd9c8
|
Some cleanup since NpcStats is now also CreatureStats
This isn't a thorough cleaning, so keep an eye out for more
|
2013-08-09 01:14:08 -07:00 |
|
Chris Robinson
|
75b6515915
|
Inherit NpcStats from CreatureStats
|
2013-08-08 23:28:02 -07:00 |
|
Chris Robinson
|
89c7f5bc70
|
Handle object activation as a werewolf
|
2013-08-08 22:34:53 -07:00 |
|
Chris Robinson
|
946ca7f931
|
Return the appropriate name for werewolf NPCs
|
2013-08-08 04:40:31 -07:00 |
|
Chris Robinson
|
dfdd2dc308
|
Handle swimleft and swimright soundgen keys
|
2013-08-08 04:40:31 -07:00 |
|
Chris Robinson
|
109df46590
|
Fix werewolf claw damage multiplier
|
2013-08-08 04:40:31 -07:00 |
|
Chris Robinson
|
2c03fec4bb
|
Use the fatigue term for jumping
|
2013-08-06 19:49:00 -07:00 |
|
Chris Robinson
|
b70975a74d
|
Move getEvasion to CreatureStats
|
2013-08-02 00:21:01 -07:00 |
|
Marc Zinnschlag
|
5cafe65cd7
|
Merge remote-tracking branch 'scrawl/cppcheck'
|
2013-07-31 20:00:35 +02:00 |
|
scrawl
|
7dc30a01cd
|
Some changes suggested by cppcheck
|
2013-07-31 18:46:32 +02:00 |
|
scrawl
|
43e0df479e
|
Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping
|
2013-07-31 16:30:22 +02:00 |
|
Marc Zinnschlag
|
6ce2b962e1
|
Merge remote-tracking branch 'scrawl/inventory'
|
2013-07-31 09:15:22 +02:00 |
|
scrawl
|
16cacb338a
|
Initialize MWMechanics::AiSequence from ESM::AiPackageList
|
2013-07-31 00:55:08 +02:00 |
|
scrawl
|
45006ea193
|
Fix inventory/container content loading so that it's done for dynamically spawned objects as well
|
2013-07-31 00:02:24 +02:00 |
|
scrawl
|
472a381263
|
Fix health meter (again)
|
2013-07-30 16:09:12 +02:00 |
|
scrawl
|
426e3ec6c6
|
Fix enemy health meter for creatures
|
2013-07-30 06:17:21 +02:00 |
|
scrawl
|
3961c276b8
|
Added enemy health meter
|
2013-07-30 06:00:20 +02:00 |
|
Chris Robinson
|
3744850545
|
Fix hand-to-hand health damage reduction
|
2013-07-28 16:07:09 -07:00 |
|
Chris Robinson
|
39507e3f0f
|
Decrease armor condition on successful hits
|
2013-07-28 15:51:17 -07:00 |
|
Chris Robinson
|
1af48ab6e0
|
Decrease weapon condition on successful hits
|
2013-07-28 15:17:01 -07:00 |
|
Chris Robinson
|
54f91d4b3a
|
Implement hand-to-hand attacks
|
2013-07-28 06:48:25 -07:00 |
|
Chris Robinson
|
a34f0de3e1
|
Play the correct medium armor foot sounds
|
2013-07-28 04:17:36 -07:00 |
|
Chris Robinson
|
db4f34b332
|
Play hit sounds when hitting creatures and NPCs
|
2013-07-27 11:20:39 -07:00 |
|
Chris Robinson
|
1a40d01afa
|
Fix NPC armor rating calculation and reduce redundant lookups
|
2013-07-27 09:31:16 -07:00 |
|
Chris Robinson
|
3298eb1b37
|
Implement HitOnMe script function
|
2013-07-26 10:50:23 -07:00 |
|
Chris Robinson
|
5379e607cb
|
Handle the OnPCHitMe script variable
|
2013-07-26 10:50:23 -07:00 |
|
Chris Robinson
|
f215d2cc30
|
Only raise weapon skills for the player
|
2013-07-26 10:50:23 -07:00 |
|
Chris Robinson
|
dd6edd21f8
|
Add a separate on-hit method to handle objects being hit
|
2013-07-26 10:50:23 -07:00 |
|
Chris Robinson
|
a569ae367e
|
Fix hit chance calculation
|
2013-07-25 13:09:26 -07:00 |
|
Chris Robinson
|
6195062d72
|
Try to figure out what gets hit
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
|
2013-07-25 12:58:43 -07:00 |
|
Chris Robinson
|
b3a057d679
|
Handle hit chance and damage calculation
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
|
2013-07-25 08:15:42 -07:00 |
|
Chris Robinson
|
1dcc893703
|
Merge remote-tracking branch 'zini/master' into combat
|
2013-07-25 01:16:49 -07:00 |
|
Chris Robinson
|
92cc566fdc
|
Rename the Class::attack method to Class::hit
|
2013-07-25 00:30:01 -07:00 |
|
Chris Robinson
|
d9a9c3d6bd
|
Handle the "land" soundgen type
|
2013-07-24 10:36:04 -07:00 |
|
Chris Robinson
|
d8ec813939
|
Say something from the "hit" dialog topic when losing health
|
2013-07-24 10:02:50 -07:00 |
|
Chris Robinson
|
cc8e8c1272
|
Use the attack strength as determined by how long the attack was held
|
2013-07-24 03:18:53 -07:00 |
|
Chris Robinson
|
0c8d4d9be2
|
Add beginnings of melee hits
|
2013-07-24 02:51:42 -07:00 |
|
Emanuel Guevel
|
70a5a83419
|
Change the formula used to calculate initial NPC health
|
2013-07-23 16:48:54 +02:00 |
|
Emanuel Guevel
|
1c330fc899
|
Use the correct formula for NPC health initialization
|
2013-07-21 10:13:46 +02:00 |
|
Emanuel Guevel
|
7837dcdc19
|
Calculate NPC health on loading instead of updating it continually
Only NPC with auto-calculated stats are concerned.
|
2013-07-20 22:14:10 +02:00 |
|
Chris Robinson
|
ac4dfd3b39
|
Play the appropriate foot sound based on footwear
|
2013-07-18 21:50:11 -07:00 |
|
Chris Robinson
|
9ea6b22a83
|
Handle soundgen animation keys
|
2013-07-17 23:58:21 -07:00 |
|
scrawl
|
8a3d3f954b
|
NPC/creature persistence flag
|
2013-05-16 18:50:26 +02:00 |
|
scrawl
|
0c4a963132
|
Container UI rewrite
|
2013-05-11 18:38:27 +02:00 |
|
Marc Zinnschlag
|
95eeea2a27
|
Revert "Merge remote-tracking branch 'glorf/acrobatics'"
This reverts commit 089ef7a2a0 , reversing
changes made to 67422c397c .
|
2013-05-01 16:56:16 +02:00 |
|
Marc Zinnschlag
|
6f0ccb6e38
|
Merge remote-tracking branch 'scrawl/insertrecords'
|
2013-05-01 13:55:26 +02:00 |
|
scrawl
|
40a0969055
|
Insert records that may not exist in vanilla MW
|
2013-05-01 12:47:50 +02:00 |
|
Glorf
|
5a8c1661be
|
Jump acrobatics working, started falling acrobatics implementation
|
2013-04-30 20:44:17 +02:00 |
|
scrawl
|
ef9afeb53e
|
Auto calculate attributes if there are not specified in the NPC record
|
2013-04-18 23:51:43 +02:00 |
|
scrawl
|
ebaf80d539
|
Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.
|
2013-04-03 23:55:57 +02:00 |
|
Chris Robinson
|
b6f2b39a2f
|
Clear the movement and rotation vector when getting them
|
2013-03-31 01:56:38 -07:00 |
|
Chris Robinson
|
7b02ec411b
|
Apply the rotation when updating the character controller
|
2013-03-31 01:29:24 -07:00 |
|
Chris Robinson
|
0ce188b7cc
|
Store the position and rotation in MWMechanics::Movement
|
2013-03-30 19:00:46 -07:00 |
|
scrawl
|
95e1cdc07d
|
Move getArmorRating to MWWorld::Class.
|
2013-03-17 22:29:12 +01:00 |
|
scrawl
|
dd57eabc3e
|
Better use an enum for magic effect IDs
|
2013-03-16 23:28:26 +01:00 |
|
scrawl
|
485b6c855a
|
Fix NPC race height not being applied
|
2013-03-15 16:44:35 +01:00 |
|
scrawl
|
41a958cd4e
|
Fix hardcoded beast races in MWClass::Npc::getModel
|
2013-03-12 02:50:23 +01:00 |
|
scrawl
|
0ee0dbdb97
|
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
|
2013-03-07 14:00:13 +01:00 |
|
scrawl
|
268bb23590
|
Implemented sneaking animation
|
2013-03-06 16:58:56 +01:00 |
|
Chris Robinson
|
955e2713a9
|
Fix encumbrance term calculation
|
2013-02-25 17:29:32 -08:00 |
|
Chris Robinson
|
89d4c245e9
|
Better calculate jump velocity
The fatigue term isn't currently used correctly
|
2013-02-24 03:30:33 -08:00 |
|
Chris Robinson
|
84227caa0c
|
Cleanup Npc::getSpeed a little
|
2013-02-22 01:30:06 -08:00 |
|
Chris Robinson
|
8255a64bfe
|
Handle levitate and swift swim effects
|
2013-02-19 02:10:36 -08:00 |
|
Chris Robinson
|
5a1a0b7338
|
Add and use an MWWorld::isFlying method
|
2013-02-18 22:39:43 -08:00 |
|
Chris Robinson
|
e1a1530774
|
Better implement Npc::getSpeed
|
2013-02-15 01:27:57 -08:00 |
|
Chris Robinson
|
04524fbf92
|
Don't scale the movement vector up
|
2013-02-06 15:23:52 -08:00 |
|
Chris Robinson
|
8d98f3649c
|
Use a separate class to handle activator mechanics
|
2013-01-28 23:39:11 -08:00 |
|
Emanuel Guevel
|
05796d85a4
|
NPC: take stats from NPDT12 into account
Some available stats (level, reputation and disposition) were not used
for NPC with auto-calculated stats.
|
2013-01-20 17:44:08 +01:00 |
|
eduard
|
2dc0064cc2
|
more string lowercase
|
2013-01-09 20:51:52 +01:00 |
|
Marc Zinnschlag
|
75f64aa38b
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
apps/openmw/mwmechanics/npcstats.cpp
apps/openmw/mwmechanics/npcstats.hpp
|
2012-11-10 15:44:44 +01:00 |
|
Marc Zinnschlag
|
ceaf1677ce
|
Issue #219: rewrote AI settings and implemented AI settings filters
|
2012-11-10 11:38:37 +01:00 |
|
scrawl
|
33b4b29fbc
|
persuasion mechanics, added reputation
|
2012-11-10 00:29:36 +01:00 |
|
scrawl
|
ace9ee9c83
|
persuasion dialog
|
2012-11-09 20:18:38 +01:00 |
|
scrawl
|
b2afb1fd5c
|
Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/spellbuyingwindow.cpp
apps/openmw/mwgui/trainingwindow.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
|
2012-11-08 23:16:40 +01:00 |
|
Marc Zinnschlag
|
918316168f
|
Merge remote-tracking branch 'greye/store' into next
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
|
2012-11-07 19:34:28 +01:00 |
|
emoose
|
7a7825577a
|
Changed: use MWWorld::Ptr for PhysicsSystem arguments
|
2012-11-05 19:37:27 +00:00 |
|
greye
|
bd1bb2e55d
|
applying new interface vol.1, inconsistent
|
2012-11-05 18:39:42 +04:00 |
|
greye
|
3c2ce25f5f
|
m prefix for mwworld/cellstore.hpp
|
2012-11-05 16:07:59 +04:00 |
|
gugus
|
f72f898bd9
|
implement barterOffer. It's used for travel only.
I've started to implement disposition, but it's very basic for now.
|
2012-11-05 11:07:43 +01:00 |
|
scrawl
|
a04df37f83
|
implemented looting corpses
|
2012-10-28 16:04:33 +01:00 |
|
Marc Zinnschlag
|
ed3641b214
|
Issue #68: check for essential actors
|
2012-10-27 13:33:54 +02:00 |
|
Marc Zinnschlag
|
9172c3ec4d
|
Issue #68: stop NPCs from instantly dropping dead
|
2012-10-23 13:54:36 +02:00 |
|
Marc Zinnschlag
|
bdca5aff87
|
Issue #68: simplified the dynamic stats interface
|
2012-10-19 13:10:06 +02:00 |
|
greye
|
721324c1db
|
rm record inheritance, rework esmtool accordingly
|
2012-09-30 23:34:53 +04:00 |
|
greye
|
18cc435aa1
|
resolving conflicts
|
2012-09-21 13:13:11 +04:00 |
|
Marc Zinnschlag
|
4abb9a00da
|
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
|
2012-09-18 11:25:09 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
Marc Zinnschlag
|
9de7b3bf90
|
Issue #356: Properly support ingredients effect in ActiveSpells (hopefully)
|
2012-09-13 11:30:59 +02:00 |
|
Marc Zinnschlag
|
6c928e93d3
|
added missing initialisation of NPC/creature spell lists from ESX records
|
2012-09-10 13:04:00 +02:00 |
|
Jason Hooks
|
23777033fd
|
Starting to implement new PhysicActor
|
2012-09-05 17:44:11 -04:00 |
|
Jason Hooks
|
0697c7f7f4
|
Finally merged in master
|
2012-09-01 17:28:12 -04:00 |
|
greye
|
a90547bbbe
|
code formatting
|
2012-08-29 21:35:06 +04:00 |
|
Jason Hooks
|
63a40e9ba3
|
npc xy disabled
|
2012-08-16 15:41:42 -04:00 |
|
Jason Hooks
|
7b8b4c366d
|
Set angle now working for npcs and creatures
|
2012-08-14 20:29:48 -04:00 |
|
Marc Zinnschlag
|
6534c2a55a
|
Issue #107: WindowManager is accessed only through the interface class from now on
|
2012-08-12 18:11:09 +02:00 |
|
Marc Zinnschlag
|
b68f9d6a28
|
Issue #107: MechanicsManager is accessed only through the interface class from now on
|
2012-08-11 17:30:55 +02:00 |
|
Jason Hooks
|
083e3537b4
|
post merge
|
2012-08-09 17:21:59 -04:00 |
|
Jason Hooks
|
cacf0bd10d
|
Basic collision with npcs
|
2012-08-04 15:43:33 -04:00 |
|
greye
|
26595f22f6
|
float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
|
2012-07-26 16:14:11 +04:00 |
|
greye
|
e7666d3a7f
|
move responsibility for cell changing from CellStore::insertObject to Class::moveToCell
|
2012-07-25 20:31:39 +04:00 |
|
greye
|
6a3a728a56
|
Class::getModel implementation
|
2012-07-25 20:31:39 +04:00 |
|
greye
|
32b1350b63
|
CreatureStats class
|
2012-07-22 18:29:54 +04:00 |
|
Marc Zinnschlag
|
2c70a93553
|
Merge branch 'master' into potions
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
2012-07-17 10:32:18 +02:00 |
|
Marc Zinnschlag
|
84d846cf07
|
Issue #314: implemented apply and skillUsageSucceeded functions for MWClass::Npc
|
2012-07-13 09:16:27 +02:00 |
|
gugus
|
410b693555
|
setAngle improvement
|
2012-07-10 11:15:46 +02:00 |
|
Jason Hooks
|
b5edad790d
|
merge
|
2012-07-07 15:27:04 -04:00 |
|
Marc Zinnschlag
|
d30ba14a17
|
Issue #324: Finished turning NpcStats into a proper class
|
2012-07-06 18:23:48 +02:00 |
|
Marc Zinnschlag
|
771863e73b
|
Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue
|
2012-07-06 15:50:26 +02:00 |
|
Marc Zinnschlag
|
5a7b95bf7a
|
Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp
|
2012-07-03 13:15:20 +02:00 |
|
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
2012-07-03 12:30:50 +02:00 |
|
Marc Zinnschlag
|
7fcd41c69d
|
Issue #107: Detemplateised CellStore; some include cleanup
|
2012-06-29 18:54:23 +02:00 |
|
Marc Zinnschlag
|
76174098c7
|
Issue #107: CellStore moved from ESMS to MWWorld
|
2012-06-29 16:48:50 +02:00 |
|
Marc Zinnschlag
|
ea29b74bb4
|
added per NPC/creature basic AI-settings (hello, fight, flee, alarm)
|
2012-06-16 16:17:42 +02:00 |
|
Jason Hooks
|
897a331244
|
NPC activation
|
2012-06-13 12:21:51 -04:00 |
|
Jason Hooks
|
20288de685
|
Post merge
|
2012-06-11 15:39:57 -04:00 |
|
Alexander "Ace" Olofsson
|
f675d8d039
|
Merge branch 'master'
|
2012-06-11 19:09:10 +02:00 |
|
Jason Hooks
|
595b0729da
|
Few things changed
|
2012-06-10 21:08:58 -04:00 |
|
Jason Hooks
|
fb0a52809d
|
Changing transformation processing
|
2012-06-09 15:19:15 -04:00 |
|
Jason Hooks
|
fb4e7f02b9
|
code correction
|
2012-05-29 22:03:00 -04:00 |
|
Marc Zinnschlag
|
36885b2e40
|
Issue #176: removed enable/disable functions from Creature, Npc and Light
|
2012-05-25 17:04:33 +02:00 |
|
scrawl
|
76d71f86bc
|
fixed a faction case folding issue
|
2012-05-21 03:10:55 +02:00 |
|
scrawl
|
e9ea1fba4e
|
fixed typo getCapacity method
|
2012-05-15 22:31:52 +02:00 |
|
Marc Zinnschlag
|
fdfddc8be7
|
some todo comment cleanup
|
2012-05-15 21:34:32 +02:00 |
|
Marc Zinnschlag
|
7e00fea18b
|
added getEncumbrance function
|
2012-05-15 21:34:00 +02:00 |
|
Marc Zinnschlag
|
c6493fb133
|
added getCapacity function
|
2012-05-15 21:17:00 +02:00 |
|
scrawl
|
4655ec94f0
|
Merge branch 'master' into physicsaedra2 & fix warnings
Conflicts:
apps/openmw/mwworld/scene.cpp
|
2012-04-30 18:46:51 +02:00 |
|
scrawl
|
50d79a8815
|
Merge branch 'next' into tooltips
|
2012-04-29 17:30:34 +02:00 |
|
Alexander "Ace" Olofsson
|
b1af18e98d
|
Merged next
|
2012-04-29 09:28:07 +02:00 |
|
scrawl
|
5d4d35a02c
|
Merge branch 'master' into graphics
|
2012-04-28 20:43:53 +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
|
f4428097f9
|
removing more cout spam
|
2012-04-23 15:37:38 +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 |
|
Jason Hooks
|
1ce759af06
|
Merging in master
|
2012-04-17 18:12:05 -04:00 |
|
scrawl
|
cdd4d83d9e
|
moved the tooltip info to the appropriate MWWorld::Class classes
|
2012-04-16 22:58:16 +02:00 |
|
Marc Zinnschlag
|
afa859a6a6
|
Merge remote branch 'jhooks/clothingarmor'
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
|
2012-04-15 22:06:05 +02:00 |
|
gugus
|
03d6d1fb82
|
NPC rank is correctly loaded now. Also corrected a potential bug (i think).
|
2012-04-12 17:08:57 +02:00 |
|
Alexander "Ace" Olofsson
|
290d09de64
|
Switching creature and npc to using the same id storage as the rest of the records
|
2012-04-08 18:32:40 +02:00 |
|
Jason Hooks
|
ebab98a8a0
|
Restructuring things
|
2012-04-07 22:02:20 -04:00 |
|
gugus
|
be4af711af
|
NPC rank was not loaded. Not sure if it's the right way, but it seems to work.
|
2012-04-03 17:30:19 +02:00 |
|
Jason Hooks
|
57299571d5
|
Preparing for clothes/armor
|
2012-04-02 22:08:46 -04:00 |
|
Jason Hooks
|
b9fabce9c4
|
Awesome, working
|
2012-03-27 20:17:54 -04:00 |
|
Jason Hooks
|
18a139cd66
|
adding up and down move buttons
|
2012-03-24 22:03:08 -04:00 |
|
Marc Zinnschlag
|
79158b9325
|
NPCs are using InventoryStore instead of ContainerStore from now on
|
2012-03-10 12:49:54 +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 |
|
Marc Zinnschlag
|
c081160591
|
replaced container store in ref data with new custom data implementation
|
2012-01-27 14:55:58 +01:00 |
|
Marc Zinnschlag
|
b0256cea34
|
replaced movement settings in ref data with new custom data implementation
|
2012-01-27 13:17:30 +01:00 |
|
Marc Zinnschlag
|
aa87bd4030
|
replaced creature stats in ref data with new custom data implementation
|
2012-01-26 11:35:47 +01:00 |
|
Marc Zinnschlag
|
c6761e3470
|
replaced NPC stats in ref data with new custom data implementation
|
2012-01-25 16:56:49 +01:00 |
|
Marc Zinnschlag
|
9b910dda94
|
clean up
|
2012-01-17 15:10:53 +01:00 |
|
Jason Hooks
|
7fde576dd9
|
actor physics again
|
2012-01-07 23:21:19 -05:00 |
|
Jason Hooks
|
a615369189
|
Warning and different physics
|
2012-01-06 22:52:15 -05:00 |
|
Jason Hooks
|
d855bb4fc6
|
physics reenabled
|
2011-12-27 17:52:17 -05:00 |
|
Jason Hooks
|
a6b88b48ec
|
A different way
|
2011-12-27 00:20:14 -05:00 |
|
Jason Hooks
|
7eee54bcd7
|
More physics and managing of Animation objects
|
2011-12-25 01:52:57 -05:00 |
|
Jason Hooks
|
1b835d6702
|
Cell changing fixes
|
2011-12-24 21:53:12 -05:00 |
|
Jason Hooks
|
5c48d8fc1e
|
more stuff
|
2011-12-09 03:02:09 -05:00 |
|
Jason Hooks
|
ee98a2af1a
|
Empty npcs
|
2011-12-09 00:08:30 -05:00 |
|
Jason Hooks
|
7319f7a8c6
|
Many bugs fixed related to changing cells
|
2011-11-19 01:01:19 -05:00 |
|
Jason Hooks
|
15fcdc8b72
|
Physics working
|
2011-11-17 19:38:52 -05:00 |
|
Jason Hooks
|
4dc59dfbdd
|
Scenenode flip
|
2011-11-17 17:10:27 -05:00 |
|
Jason Hooks
|
db57f0a1a5
|
more corrections
|
2011-11-13 18:19:29 -05: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 |
|
Jacob Essex
|
9aac625000
|
Changes to move the mutable ESM::Position data to RefData
|
2011-11-08 00:08:00 +00:00 |
|
Jason Hooks
|
56affd018a
|
Some cleanup
|
2011-06-15 13:09:47 -04:00 |
|
Jason Hooks
|
93f41e25a4
|
fs-strict
|
2011-06-08 17:29:28 -04:00 |
|
Jason Hooks
|
65cc0e8317
|
trying strict
|
2011-06-08 17:15:13 -04:00 |
|
Jason Hooks
|
3a9007849d
|
Windows fix
|
2011-06-08 00:35:30 -04:00 |
|
Jason Hooks
|
4d31ca2c86
|
Leading slashes now work, efficiency changes
|
2011-06-07 17:17:25 -04:00 |
|
Jason Hooks
|
45453fd7a9
|
Case insensitive external loader working
|
2011-06-06 20:11:23 -04:00 |
|
Jason Hooks
|
f2a0fa8af2
|
Adding files to directory map
|
2011-06-05 23:46:18 -04:00 |
|
Jason Hooks
|
2aaa0f4578
|
Backslash working in linux
|
2011-06-04 01:29:57 -04:00 |
|
Jason
|
b92955763a
|
Introducing Dir Archive
|
2011-06-03 20:28:47 -04:00 |
|
Jason Hooks
|
51b74c2f05
|
starting
|
2011-05-23 19:01:36 -04:00 |
|
Marc Zinnschlag
|
7653caea27
|
Merge branch 'master' into collision
Conflicts:
apps/openmw/mwclass/npc.cpp
|
2011-03-22 20:02:03 +01:00 |
|
Marc Zinnschlag
|
72ce493123
|
non-unique NPC ID workaround
|
2011-03-18 10:20:14 +01:00 |
|
gugus
|
0fb2107265
|
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
Conflicts:
apps/openmw/mwclass/npc.cpp
|
2011-03-15 13:36:25 +01:00 |
|
gugus
|
9b606be4b8
|
fix direction bug
|
2011-03-11 19:39:45 +01:00 |
|
Jan-Peter Nilsson
|
12db15d9a2
|
Reset arm position changed by commit 27f69d0f5b
|
2011-03-07 19:13:24 +01:00 |
|
Jan-Peter Nilsson
|
d68141d203
|
Remove unused variables
|
2011-03-07 19:13:24 +01:00 |
|
Marc Zinnschlag
|
151560b882
|
added missing run flag for NPCs
|
2011-02-10 11:08:25 +01:00 |
|
Marc Zinnschlag
|
3cd1088695
|
crash bug fix
|
2011-02-03 12:16:20 +01:00 |
|
Marc Zinnschlag
|
65232008a5
|
fixed a crash bug in NPC rendering
|
2011-02-03 11:47:42 +01:00 |
|
Marc Zinnschlag
|
4468a2b6a8
|
added movement data to MW references; added movement interface to MWWorld::Class
|
2011-02-03 11:37:17 +01:00 |
|
Marc Zinnschlag
|
88b0908104
|
adding physics when insertering objects into the OGRE scene
|
2011-01-29 17:33:48 +01:00 |
|
Marc Zinnschlag
|
b48a5084be
|
added NPC stances
|
2011-01-18 10:45:29 +01:00 |
|
athile
|
27f69d0f5b
|
Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp.
|
2011-01-10 16:13:32 -07:00 |
|
Pieter van der Kloet
|
dd4d022301
|
Converted all tabs to four spaces
|
2011-01-05 22:18:21 +01:00 |
|
Jason Hooks
|
f3ae1ea737
|
NPC leg appearance changed
|
2011-01-01 13:00:58 -05:00 |
|
Jason Hooks
|
ba168b22e9
|
cleanupandupdate
|
2011-01-01 11:47:12 -05:00 |
|
Jason Hooks
|
11406ae6f3
|
cleanupandupdate
|
2011-01-01 11:45:11 -05:00 |
|
Jason Hooks
|
60601682cd
|
Beast races fixed
|
2010-12-21 21:45:54 -05:00 |
|
Jason Hooks
|
1896a6a2e8
|
Preliminary npcs4
|
2010-12-13 16:01:52 -05:00 |
|
Jason Hooks
|
467988455c
|
Preliminary npcs3
|
2010-12-12 22:05:47 -05:00 |
|
Jason Hooks
|
dfe20033ea
|
Preliminary npcs2
|
2010-11-25 18:36:25 -05:00 |
|
Marc Zinnschlag
|
be8f852663
|
implemented skill value handling during character creation (untested)
|
2010-09-16 10:45:08 +02:00 |
|
Marc Zinnschlag
|
2527fe92a7
|
implemented creature/NPC level
|
2010-09-15 15:32:35 +02:00 |
|
Marc Zinnschlag
|
7bb2041418
|
made rendering more robust (no more crashes, even if Ogre throws an exception)
|
2010-08-25 09:43:06 +02:00 |
|
Marc Zinnschlag
|
3b49d6c826
|
added NPC stats
|
2010-08-19 12:49:13 +02:00 |
|
Marc Zinnschlag
|
6258654383
|
fixed a very sloppy merge
|
2010-08-18 09:32:36 +02:00 |
|
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
|
2010-08-18 09:25:07 +02:00 |
|
Marc Zinnschlag
|
d57c984517
|
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
|
2010-08-14 11:27:13 +02:00 |
|
Marc Zinnschlag
|
967f85875d
|
reimplemented class-dependend rendering code in MWClass
|
2010-08-14 10:02:54 +02:00 |
|
Marc Zinnschlag
|
2acfe22975
|
added test for actor ID
|
2010-08-08 14:28:35 +02:00 |
|
Marc Zinnschlag
|
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
|
2010-08-07 20:33:07 +02:00 |
|
Marc Zinnschlag
|
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
|
2010-08-06 19:20:05 +02:00 |
|
Marc Zinnschlag
|
09c42589cc
|
implemented npc/creature activation (enters dialog gui mode for now)
|
2010-08-06 18:15:46 +02:00 |
|
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
|
2010-08-06 14:37:53 +02:00 |
|
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
2010-08-05 15:40:03 +02:00 |
|
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
2010-08-04 14:37:23 +02:00 |
|
Marc Zinnschlag
|
239498bcd4
|
added getName function
|
2010-08-03 17:11:41 +02:00 |
|
Marc Zinnschlag
|
93754b2851
|
moved some includes around
|
2010-08-03 13:32:37 +02:00 |
|
Marc Zinnschlag
|
33b6a0b800
|
moved concrete record classes to separate sub-system (mwclass)
|
2010-08-03 13:17:31 +02:00 |
|