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

4682 commits

Author SHA1 Message Date
Chris Robinson
deee14ccfd Handle NPCs being a werewolf in NpcAnimation 
Note that the body mesh comes from having a WerewolfRobe force-equipped.
 2013-08-07 19:15:36 -07:00
Chris Robinson
ab44cd63a1 Remove unused function 2013-08-07 19:15:35 -07:00
Emanuel Guevel
b2e5e8dd0d Saner inventory window pinning/hiding 
Hide inventory window pin button in container, companion and barter mode.
Restore the pinned inventory window position when exiting these modes.
Allow toggling windows visibility in inventory mode only.
 2013-08-07 23:30:08 +02:00
Alex
b9579e085f cleanup 2013-08-07 15:40:57 -04:00
Alex
a0931b01fe Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg 2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32 mild cleanup 2013-08-07 13:16:20 -04:00
PLkolek
8f4506f5b6 Implemented drowning. 
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
 2013-08-07 16:46:46 +02:00
Emanuel Guevel
48d2554ac3 Auto-equip when items are added to the inventory 
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
 2013-08-07 15:17:55 +02:00
Emanuel Guevel
e0d0cdd18a Do not auto-equip items continuously 
This was called every couple of frames.
 2013-08-07 14:30:13 +02:00
Chris Robinson
076e7d8e16 Make insertBegin internal 2013-08-07 03:56:07 -07:00
Chris Robinson
2b2101958d Destroy the scene node we create 2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531 Remove unused/unneeded parameters 2013-08-07 03:56:06 -07:00
Emanuel Guevel
fd0a159a64 MWScript: update first unused opcode number 2013-08-07 12:05:53 +02:00
Emanuel Guevel
47b8a31317 Fixes suggested by KittyCat 2013-08-07 12:05:53 +02:00
Marc Zinnschlag
932fffd1a7 Merge remote-tracking branch 'kcat/light-objects' 2013-08-07 11:21:01 +02:00
Chris Robinson
b4b095ca72 Don't try to get the center of a null bounding box 2013-08-07 01:32:36 -07:00
Chris Robinson
80d271aeb1 Remove unused stuff 2013-08-07 01:31:01 -07:00
Chris Robinson
3555476dfd Use Animation-derived objects for generic objects 2013-08-06 19:49:07 -07:00
Chris Robinson
a9dca21d05 Create the Animation SceneNode in the constructor 2013-08-06 19:49:05 -07:00
Chris Robinson
48784c7e2f Use for_each and functors to avoid some for loops 2013-08-06 19:49:05 -07:00
Chris Robinson
de95926e9f Use controllers to animate lights in ObjectLists 2013-08-06 19:49:04 -07:00
Chris Robinson
8984d8f8ee Use a map to simplify NPC part referencing 2013-08-06 19:49:02 -07:00
Chris Robinson
e976bb16c5 Add a light for torches 2013-08-06 19:49:02 -07:00
Chris Robinson
57fb065a86 Add Ogre::Light objects to the object list 
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
 2013-08-06 19:49:01 -07:00
Chris Robinson
a9cc3a2844 Ensure a valid CellStore for Ptr::isInCell 2013-08-06 19:49:01 -07:00
Chris Robinson
1f436f9886 Render torches 2013-08-06 19:49:01 -07:00
Chris Robinson
8f69c51b24 Avoid some unnecessary references 2013-08-06 19:49:00 -07:00
Chris Robinson
2c03fec4bb Use the fatigue term for jumping 2013-08-06 19:49:00 -07:00
Chris Robinson
eab4e09566 Handle the pick/probe in the character controller 2013-08-06 19:48:59 -07:00
scrawl
3f7daa4884 Forgot to change initTerrainTextures 2013-08-07 02:58:03 +02:00
Alex
de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 2013-08-06 20:38:41 -04:00
scrawl
76e538c22a Unused variable fix 2013-08-07 02:03:23 +02:00
scrawl
726c93c365 Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10 2013-08-07 01:34:17 +02:00
Marc Zinnschlag
03af7175dd Merge remote-tracking branch 'potatoesmaster/bug-839' 2013-08-06 17:39:29 +02:00
Emanuel Guevel
c59ad62c57 Fix UndoWerewolf script instruction 2013-08-06 14:30:01 +02:00
Emanuel Guevel
5188a1c2cd Implement script instructions Become/UndoWerewolf 2013-08-06 12:34:35 +02:00
Emanuel Guevel
20d40c4368 Implement MWWorld::World::setWerewolf() 2013-08-06 12:34:35 +02:00
Emanuel Guevel
aa563e947e Implement MWWorld::InventoryStore::unequipAll() 2013-08-06 12:34:35 +02:00
Emanuel Guevel
ddc92d1fbd Set appropriate weapon icon when player is a werewolf 2013-08-06 12:34:35 +02:00
Emanuel Guevel
d054366460 Permit to force hiding GUI windows 2013-08-06 12:34:35 +02:00
scrawl
4caac0d859 Fix idle animations repeating 2013-08-05 02:06:23 +02:00
vorenon
76a1abe9fa Don't allow the use of the "jump" key while sneaking - Update 2013-08-04 20:10:33 +02:00
vorenon
56cb36caf1 Don't allow the use of the "jump" key while sneaking 2013-08-04 19:45:41 +02:00
Emanuel Guevel
71da2f0a12 Do not allow magic/combat stance unless magic/inventory window are accessible 2013-08-04 00:21:27 +02:00
Marc Zinnschlag
41b2fa985b silenced some warnings 2013-08-03 15:26:53 +02:00
Marc Zinnschlag
9123afa863 Merge remote-tracking branch 'gus/MeleeCombat2' 2013-08-03 15:23:36 +02:00
gus
a23e7fac93 clean up 2013-08-03 13:58:16 +02:00
scrawl
982f743ddd Fix wrong idle animations played 2013-08-03 13:13:33 +02:00
gus
c8bb32c40d small maths correction 2013-08-03 12:29:18 +02:00
gus
a25ee360dc use angles and GMST. not sure this work as it should 2013-08-03 12:16:51 +02:00
gus
830762722d first attempt: hit detection with a sphere (not finished) 2013-08-03 11:26:36 +02:00
Emanuel Guevel
a9483dbdf1 Show sneak indicator when sneaking 
Temporary solution, as the indicator should be shown only when the
player is not detected by any other actor.
 2013-08-03 03:03:29 +02:00
Emanuel Guevel
8f8362d2c4 Expose sneak indicator widget through WindowManager 2013-08-03 03:03:29 +02:00
Emanuel Guevel
9757694060 Update sneaking indicator position with other widgets 2013-08-03 02:43:56 +02:00
vorenon
aa45127895 Adjusted swish sounds 
Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.
 2013-08-02 16:33:39 +02:00
Chris Robinson
f57c829cba Play the appropriate swish sound and follow-up animation 2013-08-02 00:21:02 -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
Marc Zinnschlag
ca94d1a2fb Merge remote-tracking branch 'swick/inventorypos' 
Conflicts:
	apps/openmw/mwgui/inventorywindow.cpp
 2013-07-31 22:16:56 +02:00
Marc Zinnschlag
24273f338b Merge remote-tracking branch 'scrawl/master' 2013-07-31 22:12:07 +02:00
Sebastian Wick
7ed763262f GUI mode dependent position 2013-07-31 21:40:29 +02:00
scrawl
fe51a00112 Fix the initial player inventory being added twice when starting a new game 2013-07-31 21:00:58 +02:00
scrawl
f1f6336a4a Fixed screenshot keybinding, and make it bindable 2013-07-31 20:24:44 +02:00
Marc Zinnschlag
5cafe65cd7 Merge remote-tracking branch 'scrawl/cppcheck' 2013-07-31 20:00:35 +02:00
scrawl
d106ed3b08 Fixed alchemy 2013-07-31 19:03:51 +02:00
Marc Zinnschlag
4dfd5282ab Merge remote-tracking branch 'kolek/enchantingwindow' 2013-07-31 19:01:49 +02:00
Marc Zinnschlag
25917b00ec Merge remote-tracking branch 'scrawl/master' 2013-07-31 19:00:24 +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
PLkolek
f297c21e4d Old door sound fades out on door open/close. Door sound is synchronised to angle on action. 2013-07-31 15:46:23 +02:00
PLkolek
8bc8c38f2d Spell cost is updatedon every change in enchanting and spellmaking. 2013-07-31 13:33:30 +02:00
PLkolek
7fd7621458 Fixed area slider in self enchantments. 2013-07-31 12:26:34 +02:00
Marc Zinnschlag
6ce2b962e1 Merge remote-tracking branch 'scrawl/inventory' 2013-07-31 09:15:22 +02:00
Marc Zinnschlag
eedced729f Merge remote-tracking branch 'scrawl/master' 2013-07-31 09:14:12 +02:00
Marc Zinnschlag
7639506e49 Merge remote-tracking branch 'scrawl/ai' 2013-07-31 09:07:46 +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
90a5d8b6f5 Fix uninitialized AL listener position/orientation when the game is paused during the first frame 2013-07-30 23:24:18 +02:00
Marc Zinnschlag
958b0c4915 Merge remote-tracking branch 'scrawl/untilhealed' 2013-07-30 22:41:05 +02:00
scrawl
da01ec4f52 Only show the "Rest until healed" button when stats are not full 2013-07-30 22:07:27 +02:00
scrawl
04b90b7d14 Other actors no longer collide with an actor that has collision disabled 2013-07-30 22:00:48 +02:00
scrawl
472a381263 Fix health meter (again) 2013-07-30 16:09:12 +02:00
Marc Zinnschlag
3642562959 Merge remote-tracking branch 'scrawl/master' 2013-07-30 08:11:40 +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
Marc Zinnschlag
e27ba55541 Merge remote-tracking branch 'swick/countdialog' 2013-07-29 21:38:04 +02:00
Sebastian Wick
40d3efc671 use cancel methid 2013-07-29 18:35:23 +02:00
Sebastian Wick
7b40e57ba1 Allow the 'Activate' key to close the countdialog window; cleanups 2013-07-29 18:27:00 +02:00
Marc Zinnschlag
90ab7b2bf5 Merge remote-tracking branch 'swick/viewmodetransission' 2013-07-29 17:08:49 +02:00
Sebastian Wick
7c24c0a64e fix uninitialized variables 2013-07-29 16:45:35 +02:00
Sebastian Wick
d2b7cb5bb2 First/Third person transitions with mouse wheel 2013-07-29 16:43:16 +02:00
Sebastian Wick
1b310c5c5b use SDL resolutions in the ingame settings 2013-07-29 13:34:56 +02:00
Marc Zinnschlag
3fa4a194a7 Merge remote-tracking branch 'scrawl/master' 2013-07-29 09:59:23 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +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
465f4d2063 Properly handle starting an animation at the end 2013-07-28 09:56:03 -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