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
Marc Zinnschlag
5f5619f39d
Merge remote-tracking branch 'swick/sdlresolutions'
2013-07-29 13:51:04 +02:00
Marc Zinnschlag
a547c2584e
Merge remote-tracking branch 'swick/sdl2fix'
2013-07-29 13:51:00 +02:00
Sebastian Wick
1b310c5c5b
use SDL resolutions in the ingame settings
2013-07-29 13:34:56 +02:00
Sebastian Wick
0d2b357bdf
use SDL_WINDOWPOS_CENTERED_DISPLAY and SDL_WINDOWPOS_UNDEFINED_DISPLAY instead of coordinates
2013-07-29 12:38:57 +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
b7e81dbc5b
Ignore controllers on the root NiNode
...
I wonder if we should ignore the root NiNode completely.
2013-07-28 04:20:33 -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
f73008546f
Keep a sound updated with its object's position
2013-07-27 07:24:18 -07:00
Chris Robinson
c94653dc49
Implement the ModRegion script function
2013-07-27 07:10:18 -07:00
Chris Robinson
1174b85ac8
Implement Disable/EnableTeleporting script functions
2013-07-27 00:14:55 -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
bec420c69b
Add Class::onHit for creatures
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
Emanuel Guevel
aa14656ff2
esmtool: fix swapped comparison operators
2013-07-26 10:24:15 +02:00
Emanuel Guevel
e7459a04b1
Fix always false comparison
...
SDL_GetWindowWMInfo result of type SDL_bool (SDL_TRUE = 1 or
SDL_FALSE = 0) should not be compared to -1.
2013-07-26 10:24:15 +02:00
Marc Zinnschlag
3fbbbdc64b
Merge remote-tracking branch 'scrawl/master'
2013-07-26 08:06:53 +02: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
4ad28ed369
Don't play a weapon-down sound when unreadying a spell
2013-07-25 00:46:20 -07:00
Chris Robinson
92cc566fdc
Rename the Class::attack method to Class::hit
2013-07-25 00:30:01 -07:00
Chris Robinson
fb0ee7f2fc
Improve constness of the Nif RecordPtr structs
2013-07-24 23:58:35 -07:00
Chris Robinson
8e24cab935
Strip trailing whitespace from textkeys
2013-07-24 23:21:19 -07:00
Chris Robinson
0db02af807
Set up the weapon state in the CharacterController constructor
2013-07-24 21:08:16 -07:00
Chris Robinson
d9a9c3d6bd
Handle the "land" soundgen type
2013-07-24 10:36:04 -07:00
Chris Robinson
705498ec24
Play a swish sound when attacking
2013-07-24 10:34:53 -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
59f1bc7542
Use time values for the aniamtion's start, stop, and loop points
...
This seems to be closer to the expected behavior. This more cleanly handles 0-
length animations, especially where the start marker comes after the stop
marker while still being on the same time key.
2013-07-24 08:38:36 -07:00
Chris Robinson
bf1d907d07
Don't play casting animations for enchantments
2013-07-24 05:39:15 -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
Chris Robinson
45302f9e25
Handle controllers in the NPC's bound object parts
2013-07-23 22:05:03 -07:00
Chris Robinson
11b094559f
Play the appropriate casting animation sound
2013-07-23 11:12:19 -07:00