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

20206 commits

This branch
This branch
All branches
Author SHA1 Message Date
AnyOldName3
25e92481f4 Merge remote-tracking branch 'refs/remotes/upstream/master' 2018-08-21 14:00:58 +01:00
AnyOldName3
15e820825f Fix another convex hull clipping issue and restore z-clipping 2018-08-21 14:00:29 +01:00
Bret Curtis
b748bb11ae
Merge pull request #1878 from Capostrophic/hitchance 
Use the correct skill for creature AI weapon hit chance rating
 2018-08-21 08:12:06 +02:00
Capostrophic
74229490e4 Use the correct skill for creature AI weapon hit chance rating 2018-08-20 21:38:57 +03:00
Bret Curtis
7f3769d5fc
Merge pull request #1874 from akortunov/combat_anims 
Fix some issues with attack animations
 2018-08-19 13:57:36 +02: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
dc9aedca7d Merged merge request !33 2018-08-18 12:08:05 +02:00
Marc Zinnschlag
91be35124c Merged merge request !35 2018-08-18 12:07:37 +02:00
Marc Zinnschlag
20c53594de Merged merge request !36 2018-08-18 12:06:35 +02:00
Marc Zinnschlag
9475df7880 Merged merge request !37 2018-08-18 12:05:01 +02:00
AnyOldName3
3ce96997d1 Remove sneaky tabs. 2018-08-18 00:09:40 +01: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
AnyOldName3
dd501f4132 Make ConvexHull::clip more resilient against large values. 2018-08-17 17:47:52 +01:00
James Carty
99b465eede Update authors 2018-08-17 13:54:58 +01:00
James Carty
331016c782 Update Authors 2018-08-17 13:48:02 +01:00
Diego Crespo
76932ebfc5 Updated AUTHORS.md 2018-08-17 08:39:50 -04: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
David Walley
a492978fe6 Update AUTHORS.md - add Loriel (Documentation) 2018-08-17 08:23:47 +00: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
AnyOldName3
987306feb9 Fix ConvexHull::extendTowardsNegativeZ 2018-08-16 23:48:19 +01: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
66a8402cdf Add missing changelog entries 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
Bret Curtis
fa1f3ec51b
Merge pull request #1873 from Capostrophic/advanced 
Remove an outdated checkbox from the advanced page of the launcher
 2018-08-15 21:46:40 +02:00
Capostrophic
37f9d45182 Remove an outdated checkbox from the advanced page 2018-08-15 16:04:29 +03:00
Bret Curtis
758d9ca122 Merge branch 'desynced' into 'master' 
Desynced

See merge request OpenMW/openmw!34
 2018-08-15 07:18:24 +00:00
Diego Crespo
5d392d3ef5 fixed some spelling mistakes in .rst files 2018-08-14 17:20:19 -04:00
Bret Curtis
4cb9b52b81 fix rebase issue 2018-08-14 23:15:30 +02:00
Andrei Kortunov
5a4d0cec3a Use new logging system for game itself 2018-08-14 23:05:43 +04:00
Marc Zinnschlag
ffb103f7c5 updated credits file 2018-08-14 19:58:28 +02:00
Yohaulticetl
4ff6f64ecd Added entry to the changelog. 2018-08-14 19:58:28 +02:00
Yohaulticetl
640b32da56 Fixed merge conflicts 2018-08-14 19:57:48 +02:00