AnyOldName3
|
25e92481f4
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2018-08-21 14:00:58 +01:00 |
|
Capostrophic
|
74229490e4
|
Use the correct skill for creature AI weapon hit chance rating
|
2018-08-20 21:38:57 +03:00 |
|
Bret Curtis
|
3c827da702
|
Merge branch 'master' into combat_anims
|
2018-08-19 10:03:39 +02:00 |
|
Bret Curtis
|
3b2781bf89
|
Merge pull request #1720 from akortunov/playvfx
Rework spell VFX management
|
2018-08-19 10:00:38 +02:00 |
|
Marc Zinnschlag
|
20c53594de
|
Merged merge request !36
|
2018-08-18 12:06:35 +02:00 |
|
James Carty
|
4489838ea3
|
Fix incorrect function call
|
2018-08-17 22:35:04 +01:00 |
|
James Carty
|
513e99148e
|
Fix function with no return value
|
2018-08-17 20:18:20 +01:00 |
|
AnyOldName3
|
80082308f0
|
Merge upstream (shadermanager log system revamp)
|
2018-08-17 18:22:13 +01:00 |
|
Andrei Kortunov
|
d7ca087f59
|
AiCast: fix aiming
|
2018-08-17 12:41:13 +04:00 |
|
Andrei Kortunov
|
31f8bea1dd
|
Rework spell effects management
|
2018-08-17 12:41:13 +04:00 |
|
Andrei Kortunov
|
8516aee6e0
|
Implement getHalfExtents() for non-actor objects
|
2018-08-17 12:40:01 +04:00 |
|
Marc Zinnschlag
|
088463ebe6
|
Merged pull request #1868
|
2018-08-17 09:37:49 +02:00 |
|
Marc Zinnschlag
|
ebdb991225
|
Merged pull request #1875
|
2018-08-17 09:37:12 +02:00 |
|
Marc Zinnschlag
|
3489951410
|
Merged pull request #1866
|
2018-08-17 09:36:44 +02:00 |
|
Capostrophic
|
ce78a34010
|
Use container ID in Equip command warning
|
2018-08-17 03:32:33 +03:00 |
|
Capostrophic
|
372697489b
|
Fix Equip command infinite loop (bug #3072)
|
2018-08-17 02:52:18 +03:00 |
|
James Carty
|
43f1c9163c
|
Fix issue in which murder wouldn't be reported after paying fine
|
2018-08-16 18:58:51 +01:00 |
|
Andrei Kortunov
|
16edac8c47
|
Fix incorrect 'preparing' word spelling
|
2018-08-16 17:47:06 +04:00 |
|
Andrei Kortunov
|
a73d42e711
|
Do not stop idle animation in spellcasting stance
|
2018-08-16 16:56:42 +04:00 |
|
Andrei Kortunov
|
b7a448cf42
|
Update idle animations after reset of mIdleState (bug #4531)
|
2018-08-16 16:56:42 +04:00 |
|
Andrei Kortunov
|
3a6c480d41
|
Do not reset idle animations when turning
|
2018-08-16 16:56:42 +04:00 |
|
Andrei Kortunov
|
15fa47827b
|
AiCombat: Avoid jittering when aiming in melee
|
2018-08-16 16:56:42 +04:00 |
|
Andrei Kortunov
|
e444b9581c
|
Do not play min attack -> max attack animation when attack strength is 0 (bug #4591)
|
2018-08-16 16:56:39 +04:00 |
|
Andrei Kortunov
|
8a48258b1b
|
Fix attack after shoot
|
2018-08-16 15:51:11 +04:00 |
|
Bret Curtis
|
dcd381049c
|
Merge pull request #1872 from akortunov/extended_logging
Use new logging system
|
2018-08-16 11:38:29 +02:00 |
|
James Carty
|
4b0a6074e7
|
Add comment
|
2018-08-16 00:29:14 +01:00 |
|
James Carty
|
6889432030
|
Move code to seperate functions for reusability
|
2018-08-16 00:26:02 +01:00 |
|
Andrei Kortunov
|
5a4d0cec3a
|
Use new logging system for game itself
|
2018-08-14 23:05:43 +04:00 |
|
Yohaulticetl
|
7e9ce99062
|
Made the werewolf check optional
|
2018-08-14 19:56:40 +02:00 |
|
Yohaulticetl
|
18e51e0e98
|
Added check for werewolves
|
2018-08-14 19:44:03 +02:00 |
|
Yohaulticetl
|
d19cbdb652
|
Factored strength into hand-to-hand combat
|
2018-08-14 19:44:03 +02:00 |
|
Capostrophic
|
22162dcbda
|
Replace std::find with std::set::find where applicable
|
2018-08-14 18:14:43 +03:00 |
|
Capostrophic
|
53599290c3
|
Make search for followers in getEnemiesNearby recursive
|
2018-08-14 16:14:48 +03:00 |
|
Capostrophic
|
75bd6e1d28
|
Make search for allies in actorAttacked recursive
|
2018-08-14 15:41:34 +03:00 |
|
Capostrophic
|
7029ed0e8d
|
Refactor follower and enemy actor processing
Make another exception for wander packages when finding allies (bug #4304)
|
2018-08-14 15:36:52 +03:00 |
|
Bret Curtis
|
d25147a930
|
Merge pull request #1863 from Capostrophic/aiming
Use the correct spell projectile speed GMST in AI aiming (bug #3948)
|
2018-08-14 10:29:22 +02:00 |
|
Bret Curtis
|
6a32a4aed0
|
Merge pull request #1810 from akortunov/weaponfix
Use fallbacks for missing weapon animations
|
2018-08-14 10:29:01 +02:00 |
|
Bret Curtis
|
f7715db25f
|
Merge pull request #1871 from akortunov/extended_logging
[Regression] Move cerr initialization out of 'try' block
|
2018-08-14 10:26:12 +02:00 |
|
Andrei Kortunov
|
9a5b016293
|
Move crashcatcher initialization to components
|
2018-08-14 11:17:05 +04:00 |
|
Allofich
|
fd89fa415a
|
Do modifiers for dynamic stats before attributes
(Fixes #4231)
|
2018-08-13 21:59:27 +09:00 |
|
Allofich
|
2cc1b52baf
|
Drain and fortify fixes for dynamicStats
(Fixes #3049)
|
2018-08-13 21:59:26 +09:00 |
|
Bret Curtis
|
61b34124e2
|
Merge pull request #1847 from akortunov/extended_logging
Improve console logging
|
2018-08-13 10:19:25 +02:00 |
|
Andrei Kortunov
|
4003fa1296
|
Keep jailing state for one frame after leaving jail (bug #3788)
|
2018-08-13 11:10:01 +04:00 |
|
Andrei Kortunov
|
9dfd775bf2
|
Implement GetPCTraveling console command
|
2018-08-13 08:30:50 +04:00 |
|
Andrei Kortunov
|
8de3383612
|
Add zero-duration spells effects to effect list (bug #3533)
|
2018-08-12 17:25:35 +04:00 |
|
Andrei Kortunov
|
307e0103dc
|
Use fallbacks for missing weapon animations (bug #4470)
|
2018-08-12 16:14:24 +04:00 |
|
Andrei Kortunov
|
7d6e3673e0
|
Implement advanced logging system (feature #4581)
|
2018-08-12 13:38:15 +04:00 |
|
Capostrophic
|
3527f3800e
|
Use the correct spell projectile speed GMST in AI aiming
|
2018-08-10 21:21:21 +03:00 |
|
Marc Zinnschlag
|
1cfc1f9bdb
|
Merged pull request #1666
|
2018-08-10 12:23:17 +02:00 |
|
Marc Zinnschlag
|
0aedb3aada
|
Merged puil request #1808
|
2018-08-10 12:22:13 +02:00 |
|