Alexei Dobrohotov
|
b85d507f35
|
Merge branch 'absorption' into 'master'
Restore empty target check in spell absorption
See merge request OpenMW/openmw!338
|
2020-10-10 19:08:14 +00:00 |
|
Alexei Dobrohotov
|
1842f546c3
|
Restore empty target check in spell absorption
|
2020-10-10 14:27:52 +03:00 |
|
AnyOldName3
|
341bcb66f5
|
Merge branch 'macos_shared_runner' into 'master'
MacOS Shared Runners
See merge request OpenMW/openmw!325
|
2020-10-09 22:42:31 +00:00 |
|
Alexei Dobrohotov
|
e930251d92
|
Merge branch 'godmode' into 'master'
Add many more godmode checks to harmful magic (bug #5633)
Closes #4264
See merge request OpenMW/openmw!336
|
2020-10-09 22:09:46 +00:00 |
|
AnyOldName3
|
5514c95b23
|
Merge branch 'debian-cache-bump' into 'master'
Bump Debian cache version numbers
See merge request OpenMW/openmw!337
|
2020-10-09 22:01:45 +00:00 |
|
AnyOldName3
|
c6eb0dacd3
|
Bump Debian cache version numbers
This should stop MR builds clobbering the increased size with their tiny
size.
|
2020-10-09 20:51:25 +00:00 |
|
Alexei Dobrohotov
|
0e8c5c5034
|
Merge branch 'avoid_collision_update' into 'master'
Update logic of "NPCs avoid collisions"
See merge request OpenMW/openmw!318
|
2020-10-09 18:43:43 +00:00 |
|
Alexei Dobrohotov
|
b85875a354
|
Ignore Burden effect in god mode
|
2020-10-09 21:34:39 +03:00 |
|
Alexei Dobrohotov
|
39678c74bf
|
Add many more godmode checks to harmful magic (bug #5633)
|
2020-10-09 20:36:51 +03:00 |
|
Alexei Dobrohotov
|
f8293536e6
|
Merge branch 'regressions' into 'master'
Fix recent regressions
See merge request OpenMW/openmw!335
|
2020-10-09 16:43:55 +00:00 |
|
Alexei Dobrohotov
|
05cd005b30
|
Fix NiTriStripsData loading
|
2020-10-09 19:37:54 +03:00 |
|
Alexei Dobrohotov
|
0dcb8c6b69
|
Fix pick/probe uses decrement
|
2020-10-09 19:20:50 +03:00 |
|
AnyOldName3
|
ea669cc115
|
Merge branch 'fix-ccache' into 'master'
Increase CCache size for Debian where needed
See merge request OpenMW/openmw!334
|
2020-10-09 14:19:55 +00:00 |
|
AnyOldName3
|
ef41edba9b
|
Install tools in before_install.osx.sh
|
2020-10-09 13:56:21 +00:00 |
|
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
|
3a39e1f8f8
|
config was from Windows CI
|
2020-10-08 22:25:16 +00:00 |
|
AnyOldName3
|
2f1b7c4d2f
|
Rename DMG file
|
2020-10-08 21:35:37 +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 |
|
AnyOldName3
|
5515bc94b7
|
Keep logs as artifacts
|
2020-10-07 21:04:36 +00: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 |
|
AnyOldName3
|
cfd9268a74
|
Install Qt if missing
|
2020-10-07 19:12:13 +00:00 |
|
AnyOldName3
|
a47d96ce0b
|
Install CMake on MacOS if it's missing
|
2020-10-07 19:06:28 +00:00 |
|
psi29a
|
c34fd220db
|
Update .gitlab-ci.yml
|
2020-10-07 17:31:29 +00: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 |
|
Petr Mikheev
|
2835ea1e21
|
Update logic of "NPCs avoid collisions"
|
2020-10-03 22:58:00 +02: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 |
|