mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 04:49:54 +00:00
Code Issues Releases Wiki Activity
23888 commits 38 branches 54 tags 122 MiB
Commit graph

208 commits

Author SHA1 Message Date
scrawl
d544551f61 Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization) 
Information provided by Hrnchamd.
 2014-01-15 15:50:45 +01:00
scrawl
da3295d69c Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations. 2014-01-15 14:53:29 +01:00
scrawl
03b2e99802 Remove unused Combat stance 2014-01-15 14:53:29 +01:00
scrawl
3a1b6dd354 Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected. 2014-01-13 10:18:02 +01:00
scrawl
ce013315ba Nothing to see here, move along. 
Fine... it's flying cliff racers. But did you really want to know?
 2014-01-05 16:09:06 +01:00
scrawl
5729672262 Show marked position on map. Implement Detect X magic effects. 2014-01-01 22:37:52 +01:00
scrawl
56893a097d Don't stack used torches 2013-12-16 13:31:03 +01:00
Marc Zinnschlag
19bd0f90b9 Merge remote-tracking branch 'rainChu/torches' 2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
30ee3c5cf6 Equipped torches and lights run out of fuel 2013-10-15 21:50:14 -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
21121d5ba5 Store the object class in the LiveCellRef 2013-08-16 04:18:48 -07:00
Chris Robinson
0f2b2ff1ce Small header cleanup 2013-08-15 01:21:43 -07:00
Chris Robinson
89c7f5bc70 Handle object activation as a werewolf 2013-08-08 22:34:53 -07:00
Chris Robinson
b70975a74d Move getEvasion to CreatureStats 2013-08-02 00:21:01 -07:00
Chris Robinson
9e7d670745 Inline Class::get(const Ptr& ptr) 2013-08-02 00:20:59 -07:00
Chris Robinson
54f91d4b3a Implement hand-to-hand attacks 2013-07-28 06:48:25 -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
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
92cc566fdc Rename the Class::attack method to Class::hit 2013-07-25 00:30:01 -07:00
Chris Robinson
0c8d4d9be2 Add beginnings of melee hits 2013-07-24 02:51:42 -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
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
scrawl
2693b78536 Add initial player inventory when new game is started 2013-04-15 02:56:23 +02:00
Marc Zinnschlag
beb1858a57 Merge remote-tracking branch 'glorf/bugfix' 2013-04-10 17:39:19 +02:00
Glorf
ad49d1ecab Sixth minor fix 2013-04-10 15:24:20 +02:00
Glorf
7c22e123f4 Bugfix #691 changes 2013-04-08 22:10:55 +02:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
Glorf
48d9885554 Started bugfix #691 2013-04-05 15:42:05 +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
Marc Zinnschlag
751c679255 Merge remote-tracking branch 'glorf/enchanting' 2013-04-01 17:35:04 +02:00
Glorf
d29a42dcbe Fixed enchanting mechanics 2013-03-31 23:18:23 +02:00
Chris Robinson
7b02ec411b Apply the rotation when updating the character controller 2013-03-31 01:29:24 -07:00
Marc Zinnschlag
573368849b Merge remote-tracking branch 'glorf/enchanting' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2013-03-29 16:48:21 +01:00
Glorf
86275e5bd4 Some enchanting fixes 2013-03-29 12:00:09 +01:00
Glorf
eb88463b94 Some enchanting fixes 2013-03-28 23:39:20 +01:00
Glorf
6643fe789c Enchanting system 2013-03-28 17:41:00 +01:00
scrawl
95e1cdc07d Move getArmorRating to MWWorld::Class. 2013-03-17 22:29:12 +01:00
scrawl
c0b0227e8a enchanting 2013-03-16 19:00:14 +01:00
Chris Robinson
89d4c245e9 Better calculate jump velocity 
The fatigue term isn't currently used correctly
 2013-02-24 03:30:33 -08:00
Marc Zinnschlag
9669eed083 Issue #219: added last missing function filters 2012-11-15 20:00:27 +01:00
Marc Zinnschlag
ed3641b214 Issue #68: check for essential actors 2012-10-27 13:33:54 +02:00
Michael Mc Donnell
b373d0ec7b Correct struct to class in forward declarations 
Fixes http://bugs.openmw.org/issues/362
 2012-08-13 13:58:35 -04:00
greye
d6150b7482 high-level implementation, unstable 2012-07-30 23:28:14 +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
87050e48c8 physics getObjectHeight(), MWWorld::Class::getModel() definition 2012-07-25 20:31:39 +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
805b81bf6e Issue #314: added skillUsageSucceeded function to Class 2012-07-13 09:03:17 +02:00
Marc Zinnschlag
7a2d613043 Issue #314: extended Class::apply function to cover the actor 2012-07-13 08:50:46 +02:00
Marc Zinnschlag
ec9ebe6b58 Merge branch 'skillgain' into potions 
Conflicts:
	apps/openmw/mwmechanics/activespells.cpp
 2012-07-10 14:08:30 +02:00
gugus
03f7740474 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/worldimp.hpp
 2012-07-09 10:39:57 +02:00
Marc Zinnschlag
10723a149b Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC 2012-07-06 18:25:16 +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
83c3972a89 Issue #314: added return value to addSpell function 2012-06-24 16:23:43 +02:00
gugus
0012d7eb58 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-03 12:53:23 +02:00
gugus
51b6d5cae0 Scale *should* work. (no script instruction yet) 2012-05-25 18:23:06 +02:00
Marc Zinnschlag
0131c53005 Issue #176: removed enable/disable functions from MWWorld::Class 2012-05-25 17:28:27 +02:00
gugus
dac98b2213 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 2012-05-21 11:02:10 +02:00
gugus
ca9224ed7f starting scale function 2012-05-21 10:58:04 +02:00
scrawl
e9ea1fba4e fixed typo getCapacity method 2012-05-15 22:31:52 +02:00
scrawl
0063387979 Merge branch 'master' into inventoryGUI 2012-05-15 21:48:05 +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
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
 2012-05-12 18:32:06 +02:00
scrawl
5b0251b09f item stacking 2012-05-12 16:17:03 +02:00
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
scrawl
53b48196f9 add interface for tooltips to MWWorld::Class 2012-04-16 19:30:52 +02:00
gugus
58d05fa503 more clean-up. Container window shows up! But there is no working close button. 2012-04-15 20:56:45 +02:00
Marc Zinnschlag
d5a7d418dd added getValue function to Class hierarchy 2012-04-07 19:53:49 +02:00
Marc Zinnschlag
c616d005e8 fixed a spelling mistake 2012-03-15 14:31:16 +01:00
Michael Papageorgiou
947288e13a Merge master and rewrite around the new detection function 2012-03-14 00:38:44 +02:00
Michael Papageorgiou
6dddf8a3d5 Pickup sounds for armors 2012-03-13 18:05:38 +02:00
Marc Zinnschlag
c314cddb1c added getEquipmentSkill function to Class hierarchy 2012-03-13 14:27:13 +01:00
Marc Zinnschlag
4b73116b9d added getEquipmentSlots function to MWWorld::Class hierarchy 2012-03-13 13:50:11 +01:00
Marc Zinnschlag
79158b9325 NPCs are using InventoryStore instead of ContainerStore from now on 2012-03-10 12:49:54 +01:00
Marc Zinnschlag
699246e54b removed insertIntoContainer function from MWWorld::Class hierarchy 2012-02-23 12:53:48 +01:00
Marc Zinnschlag
4a16553acc replaced an include with a forward declaration 2012-02-20 12:44:17 +01:00
Marc Zinnschlag
f2972b1ca0 turned ContainerStore from a template into a simple struct 2012-01-28 11:45:55 +01:00
Jason Hooks
bc58ef28cd Made corrections 2011-11-12 15:58:22 -05:00
Jason Hooks
0b3bb2719f Fixing some errors 2011-11-12 00:19:22 -05:00
Jason Hooks
f4e7bd6dfd Made some recommended changes 2011-11-11 00:20:53 -05:00
Jason Hooks
042bceb547 Changes to insertObjectRendering; Proposed insertObject 2011-11-09 18:06:55 -05:00
Jason Hooks
1faa07b279 insertObjectRendering proposed 2011-11-09 15:47:06 -05: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
b48a5084be added NPC stances 2011-01-18 10:45:29 +01:00
Marc Zinnschlag
459dd82896 implemented locking/unlocking for doors (can not be invoked by user interaction yet) 2010-08-30 11:56:55 +02:00
Marc Zinnschlag
3b49d6c826 added NPC stats 2010-08-19 12:49:13 +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
de2eeb4cde integrated insertObject function into class hierarchy 2010-08-14 09:20:47 +02:00
Marc Zinnschlag
2acfe22975 added test for actor ID 2010-08-08 14:28:35 +02:00
Marc Zinnschlag
0a60bde834 added insertIntoContainer function to class hierarchy 2010-08-06 22:20:20 +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
002345270b implemented teleport doors (only for the player for now) 2010-08-03 18:44:52 +02:00
Marc Zinnschlag
7e5ddae3b3 modified action interface to allow other actors besides the player 2010-08-03 18:22:01 +02:00
Marc Zinnschlag
c38b02bd5c added action interface 2010-08-03 18:20:15 +02:00
Marc Zinnschlag
239498bcd4 added getName function 2010-08-03 17:11:41 +02:00
Marc Zinnschlag
bfc282779b added item health interface 2010-08-03 14:14:04 +02:00
Marc Zinnschlag
ca842d1b4d reimplemented access to creature stats via new class interface 2010-08-03 11:49:12 +02:00
Marc Zinnschlag
a70c3876a2 added foundation for esm record class hierarchy 2010-08-03 11:14:57 +02:00