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

24070 commits

This branch
This branch
All branches
Author SHA1 Message Date
AnyOldName3
1aa5e5cc52 Increase CCache size for Debian where needed 2020-10-09 13:32:28 +00:00
Alexei Dobrohotov
f04be08327 Merge branch 'revert-bbcfcc88' into 'master' 
Revert "RigGeometry: convert some pairs to structs"

See merge request OpenMW/openmw!333
 2020-10-08 23:25:45 +00:00
Alexei Dobrohotov
9f08dc9968 Revert "Merge branch 'skinning' into 'master'" 
This reverts merge request !327
 2020-10-08 23:24:28 +00:00
AnyOldName3
da49901dbc Merge branch 'castray' into 'master' 
Fix RayCastingResult warning

See merge request OpenMW/openmw!331
 2020-10-08 19:48:08 +00:00
Alexei Dobrohotov
ec825b2510 Fix RayCastingResult warning 2020-10-08 22:44:46 +03:00
AnyOldName3
c26c43bb73 Merge branch 'cmake' into 'master' 
fix cmake warning

See merge request OpenMW/openmw!330
 2020-10-08 19:38:34 +00:00
tess
38e567a7e4 match opening and closing if args 2020-10-08 19:34:03 +00:00
tessa
02861fa8e3 fix cmake warning 2020-10-08 13:06:04 -05:00
psi29a
bbcfcc8823 Merge branch 'skinning' into 'master' 
RigGeometry: convert some pairs to structs

See merge request OpenMW/openmw!327
 2020-10-08 08:56:17 +00:00
psi29a
c8b3ab68b6 Merge branch 'gitlab_ci_separate_debian_cache' into 'master' 
Use separate caches for Debian builds

See merge request OpenMW/openmw!326
 2020-10-08 06:39:26 +00:00
Alexei Dobrohotov
6be808e301 RigGeometry: convert some pairs to structs 2020-10-08 03:05:59 +03:00
elsid
63a6541d0e
Use separate caches for Debian builds 
Different builds cache different states. Each time cache file is written it
erases the state created by a different type of build.
 2020-10-07 22:18:12 +02:00
psi29a
ee22081ae1 Merge branch 'nifgobrrrr' into 'master' 
More NIF stuff

See merge request OpenMW/openmw!324
 2020-10-07 10:22:56 +00:00
psi29a
bca698d951 Merge branch 'shader_line_numbering' into 'master' 
Correctly resetting line numbering during shader processing.

See merge request OpenMW/openmw!317
 2020-10-07 07:16:45 +00:00
Alexei Dobrohotov
df1014303d Add more generic extra data NIF types 2020-10-06 21:21:55 +03:00
Alexei Dobrohotov
302d8eed27 Clean up Roll- and FlipController implementation 2020-10-06 20:47:06 +03:00
AnyOldName3
c37af3c555 Merge branch 'AnyOldName3-master-patch-89933' into 'master' 
Remove incorrect spaces from filename

See merge request OpenMW/openmw!323
 2020-10-06 17:39:18 +00:00
Alexei Dobrohotov
0d02a3392a Clean up 2020-10-06 20:36:10 +03:00
Alexei Dobrohotov
e7c37f21b7 Add NiFloatInterpController abstraction 2020-10-06 20:24:05 +03:00
AnyOldName3
683cf8cad5 Remove incorrect spaces from filename 2020-10-06 16:56:55 +00:00
AnyOldName3
c9e3db40a1 Merge branch 'multi-config-build' into 'master' 
Add support for multi configurations generators on unix

See merge request OpenMW/openmw!198
 2020-10-06 14:02:04 +00:00
fredzio
e2a603f6e8 Remove blank space 2020-10-06 09:08:49 +02:00
psi29a
90f51846dd Merge branch 'AnyOldName3-master-patch-49525' into 'master' 
Correct screenshot paths in documentation

See merge request OpenMW/openmw!321
 2020-10-05 21:02:42 +00:00
AnyOldName3
03b081137a Correct screenshot paths in documentation 
These have been wrong since https://github.com/OpenMW/openmw/pull/2787
got merged
 2020-10-05 20:38:31 +00:00
psi29a
72ab340374 Merge branch 'nifdefinitions' into 'master' 
Introduce some extended NIF definitions

See merge request OpenMW/openmw!319
 2020-10-04 11:47:28 +00:00
Alexei Dobrohotov
29ccb09da5 Introduce some extended NIF definitions 2020-10-04 13:18:56 +03:00
Alexei Dobrohotov
25b966d58d Merge branch 'master' into 'master' 
Hostile Follower issue #5101

See merge request OpenMW/openmw!244
 2020-10-03 20:05:18 +00:00
Charles Calhoun
14aacb81c5 Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation. 2020-10-03 20:05:17 +00:00
Mads Buvik Sandvei
d5450a7d88 Correctly resetting line numbering during shader processing. 2020-10-03 14:22:34 +02:00
psi29a
3040b3b2b6 Merge branch 'issue-5588' into 'master' 
Prevent empty right page of journal having invisible topics (Fixes #5588)

Closes #5588

See merge request OpenMW/openmw!310
 2020-10-03 10:55:44 +00:00
Kyle Shrader
845049a166 Prevent empty right page of journal having invisible topics (Fixes #5588) 2020-10-03 10:55:44 +00:00
psi29a
54b386fe93 Merge branch 'patch-1' into 'master' 
Update install-game-files.rst

See merge request OpenMW/openmw!300
 2020-10-03 10:51:27 +00:00
imkirkdouglacus
5215ce45d0 Update install-game-files.rst 2020-10-03 10:51:27 +00:00
psi29a
4b95cb8660 Merge branch '5624' into 'master' 
Skip raycasting for zero-length rays

Closes #5624

See merge request OpenMW/openmw!316
 2020-10-03 10:31:13 +00:00
AnyOldName3
9e78f3d936 Skip raycasting for zero-length rays 
Rays with no length can't intersect anything. This also prevents an
assertion triggering with Bullet built in Debug mode.
 2020-10-03 02:19:38 +01:00
psi29a
21fa55de8e Merge branch 'gitlab_tests' into 'master' 
Run unit tests in gitlab CI for linux build

See merge request OpenMW/openmw!314
 2020-10-02 23:19:10 +00:00
psi29a
2d24e87bcc Merge branch 'nifstuffagain' into 'master' 
niffile.cpp cleanup

See merge request OpenMW/openmw!313
 2020-10-02 22:22:58 +00:00
elsid
322298e02a
Build with clang in gitlab CI for linux 2020-10-03 00:19:48 +02:00
elsid
af95474670
Run unit tests in gitlab CI for linux build 2020-10-03 00:19:48 +02:00
elsid
23fe60a067
Run unit tests in a separate build 2020-10-03 00:19:29 +02:00
psi29a
7cd5940f00 Merge branch 'psi29a-master-patch-58402' into 'master' 
Update CI/before_script.msvc.sh

See merge request OpenMW/openmw!315
 2020-10-02 21:53:39 +00:00
psi29a
1ddfb18cb3 Update CI/before_script.msvc.sh 2020-10-02 21:07:46 +00:00
Alexei Dobrohotov
4e22c2687f niffile.cpp cleanup 2020-10-02 21:50:54 +03:00
psi29a
4faaa86449 Merge branch 'cyclic_includes' into 'master' 
More accurate detection of cyclic includes

See merge request OpenMW/openmw!281
 2020-09-30 05:39:28 +00:00
psi29a
aa4e6c448b Merge branch 'spellabsorption' into 'master' 
Support enchantment absorption

See merge request OpenMW/openmw!307
 2020-09-29 15:27:52 +00:00
psi29a
60447b27c4 Merge branch 'update_to_gl_deps_for_windows' into 'master' 
make switch to using GL hosted windows deps

See merge request OpenMW/openmw!311
 2020-09-29 15:15:57 +00:00
Bret Curtis
c291bb169e fixed indentation and additional diffs 2020-09-29 13:29:12 +02:00
Bret Curtis
18899394c4 typo in path 2020-09-29 13:13:26 +02:00
Bret Curtis
bf7e1bd32b make switch to using GL hosted windows deps 2020-09-29 12:21:25 +02:00
psi29a
f1ab519fac Merge branch 'uses' into 'master' 
Handle 0-use items like vanilla (bug #5611)

Closes #5611

See merge request OpenMW/openmw!306
 2020-09-29 08:20:56 +00:00