Commit Graph

24089 Commits (341bcb66f532fb0e131eb309d2ed0d7c2ca0926b)
 

Author SHA1 Message Date
AnyOldName3 341bcb66f5 Merge branch 'macos_shared_runner' into 'master'
MacOS Shared Runners

See merge request OpenMW/openmw!325
4 years ago
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
4 years ago
AnyOldName3 5514c95b23 Merge branch 'debian-cache-bump' into 'master'
Bump Debian cache version numbers

See merge request OpenMW/openmw!337
4 years ago
AnyOldName3 c6eb0dacd3 Bump Debian cache version numbers
This should stop MR builds clobbering the increased size with their tiny
size.
4 years ago
Alexei Dobrohotov 0e8c5c5034 Merge branch 'avoid_collision_update' into 'master'
Update logic of "NPCs avoid collisions"

See merge request OpenMW/openmw!318
4 years ago
Alexei Dobrohotov b85875a354 Ignore Burden effect in god mode 4 years ago
Alexei Dobrohotov 39678c74bf Add many more godmode checks to harmful magic (bug #5633) 4 years ago
Alexei Dobrohotov f8293536e6 Merge branch 'regressions' into 'master'
Fix recent regressions

See merge request OpenMW/openmw!335
4 years ago
Alexei Dobrohotov 05cd005b30 Fix NiTriStripsData loading 4 years ago
Alexei Dobrohotov 0dcb8c6b69 Fix pick/probe uses decrement 4 years ago
AnyOldName3 ea669cc115 Merge branch 'fix-ccache' into 'master'
Increase CCache size for Debian where needed

See merge request OpenMW/openmw!334
4 years ago
AnyOldName3 ef41edba9b Install tools in before_install.osx.sh 4 years ago
AnyOldName3 1aa5e5cc52 Increase CCache size for Debian where needed 4 years ago
Alexei Dobrohotov f04be08327 Merge branch 'revert-bbcfcc88' into 'master'
Revert "RigGeometry: convert some pairs to structs"

See merge request OpenMW/openmw!333
4 years ago
Alexei Dobrohotov 9f08dc9968 Revert "Merge branch 'skinning' into 'master'"
This reverts merge request !327
4 years ago
AnyOldName3 3a39e1f8f8 config was from Windows CI 4 years ago
AnyOldName3 2f1b7c4d2f Rename DMG file 4 years ago
AnyOldName3 da49901dbc Merge branch 'castray' into 'master'
Fix RayCastingResult warning

See merge request OpenMW/openmw!331
4 years ago
Alexei Dobrohotov ec825b2510 Fix RayCastingResult warning 4 years ago
AnyOldName3 c26c43bb73 Merge branch 'cmake' into 'master'
fix cmake warning

See merge request OpenMW/openmw!330
4 years ago
tess 38e567a7e4 match opening and closing if args 4 years ago
tessa 02861fa8e3 fix cmake warning 4 years ago
psi29a bbcfcc8823 Merge branch 'skinning' into 'master'
RigGeometry: convert some pairs to structs

See merge request OpenMW/openmw!327
4 years ago
psi29a c8b3ab68b6 Merge branch 'gitlab_ci_separate_debian_cache' into 'master'
Use separate caches for Debian builds

See merge request OpenMW/openmw!326
4 years ago
Alexei Dobrohotov 6be808e301 RigGeometry: convert some pairs to structs 4 years ago
AnyOldName3 5515bc94b7 Keep logs as artifacts 4 years ago
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.
4 years ago
AnyOldName3 cfd9268a74 Install Qt if missing 4 years ago
AnyOldName3 a47d96ce0b Install CMake on MacOS if it's missing 4 years ago
psi29a c34fd220db Update .gitlab-ci.yml 4 years ago
psi29a ee22081ae1 Merge branch 'nifgobrrrr' into 'master'
More NIF stuff

See merge request OpenMW/openmw!324
4 years ago
psi29a bca698d951 Merge branch 'shader_line_numbering' into 'master'
Correctly resetting line numbering during shader processing.

See merge request OpenMW/openmw!317
4 years ago
Alexei Dobrohotov df1014303d Add more generic extra data NIF types 4 years ago
Alexei Dobrohotov 302d8eed27 Clean up Roll- and FlipController implementation 4 years ago
AnyOldName3 c37af3c555 Merge branch 'AnyOldName3-master-patch-89933' into 'master'
Remove incorrect spaces from filename

See merge request OpenMW/openmw!323
4 years ago
Alexei Dobrohotov 0d02a3392a Clean up 4 years ago
Alexei Dobrohotov e7c37f21b7 Add NiFloatInterpController abstraction 4 years ago
AnyOldName3 683cf8cad5 Remove incorrect spaces from filename 4 years ago
AnyOldName3 c9e3db40a1 Merge branch 'multi-config-build' into 'master'
Add support for multi configurations generators on unix

See merge request OpenMW/openmw!198
4 years ago
fredzio e2a603f6e8 Remove blank space 4 years ago
psi29a 90f51846dd Merge branch 'AnyOldName3-master-patch-49525' into 'master'
Correct screenshot paths in documentation

See merge request OpenMW/openmw!321
4 years ago
AnyOldName3 03b081137a Correct screenshot paths in documentation
These have been wrong since https://github.com/OpenMW/openmw/pull/2787
got merged
4 years ago
psi29a 72ab340374 Merge branch 'nifdefinitions' into 'master'
Introduce some extended NIF definitions

See merge request OpenMW/openmw!319
4 years ago
Alexei Dobrohotov 29ccb09da5 Introduce some extended NIF definitions 4 years ago
Petr Mikheev 2835ea1e21 Update logic of "NPCs avoid collisions" 4 years ago
Alexei Dobrohotov 25b966d58d Merge branch 'master' into 'master'
Hostile Follower issue #5101

See merge request OpenMW/openmw!244
4 years ago
Charles Calhoun 14aacb81c5 Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation. 4 years ago
Mads Buvik Sandvei d5450a7d88 Correctly resetting line numbering during shader processing. 4 years ago
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
4 years ago
Kyle Shrader 845049a166 Prevent empty right page of journal having invisible topics (Fixes #5588) 4 years ago