Commit Graph

24067 Commits (da49901dbc3b8c7c13dadef5dcb106dcfdf74537)
 

Author SHA1 Message Date
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
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
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
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
psi29a 54b386fe93 Merge branch 'patch-1' into 'master'
Update install-game-files.rst

See merge request OpenMW/openmw!300
4 years ago
imkirkdouglacus 5215ce45d0 Update install-game-files.rst 4 years ago
psi29a 4b95cb8660 Merge branch '5624' into 'master'
Skip raycasting for zero-length rays

Closes #5624

See merge request OpenMW/openmw!316
4 years ago
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.
4 years ago
psi29a 21fa55de8e Merge branch 'gitlab_tests' into 'master'
Run unit tests in gitlab CI for linux build

See merge request OpenMW/openmw!314
4 years ago
psi29a 2d24e87bcc Merge branch 'nifstuffagain' into 'master'
niffile.cpp cleanup

See merge request OpenMW/openmw!313
4 years ago
elsid 322298e02a
Build with clang in gitlab CI for linux 4 years ago
elsid af95474670
Run unit tests in gitlab CI for linux build 4 years ago
elsid 23fe60a067
Run unit tests in a separate build 4 years ago
psi29a 7cd5940f00 Merge branch 'psi29a-master-patch-58402' into 'master'
Update CI/before_script.msvc.sh

See merge request OpenMW/openmw!315
4 years ago
psi29a 1ddfb18cb3 Update CI/before_script.msvc.sh 4 years ago
Alexei Dobrohotov 4e22c2687f niffile.cpp cleanup 4 years ago
psi29a 4faaa86449 Merge branch 'cyclic_includes' into 'master'
More accurate detection of cyclic includes

See merge request OpenMW/openmw!281
4 years ago
psi29a aa4e6c448b Merge branch 'spellabsorption' into 'master'
Support enchantment absorption

See merge request OpenMW/openmw!307
4 years ago
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
4 years ago
Bret Curtis c291bb169e fixed indentation and additional diffs 4 years ago
Bret Curtis 18899394c4 typo in path 4 years ago
Bret Curtis bf7e1bd32b make switch to using GL hosted windows deps 4 years ago
psi29a f1ab519fac Merge branch 'uses' into 'master'
Handle 0-use items like vanilla (bug #5611)

Closes #5611

See merge request OpenMW/openmw!306
4 years ago
psi29a d9dafbe45b Merge branch 'master' into 'uses'
# Conflicts:
#   CHANGELOG.md
4 years ago
psi29a 0438d9d5bb Merge branch 'enchanting' into 'master'
Reset enchant effects displayed range when they are constant (bug #5603)

See merge request OpenMW/openmw!309
4 years ago
psi29a 61b83697f5 Merge branch 'rotation' into 'master'
Add inverse order rotation support to SetAngle (feature #5579)

Closes #5579

See merge request OpenMW/openmw!305
4 years ago