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

23880 commits

This branch
This branch
All branches
Author SHA1 Message Date
AnyOldName3
5934a9d145 Actualy build the reduced cache. 
It looks like cache is only invalidated if new files are added, not old ones removed.
 2020-07-12 15:08:47 +01:00
AnyOldName3
6f3e87ce69 Cache less stuff to avoid duplicate entries. 
This might make everything faster if we're network-bound.
 2020-07-12 13:58:12 +01:00
AnyOldName3
20859bbc50 Revert "Build the CS again." 
There wasn't enough time.

This reverts commit 22c5c7a96e.
 2020-07-12 13:55:45 +01:00
Andrei Kortunov
f12123a172
Merge pull request #2965 from Assumeru/startscript-regression 
Fix a regression caused by #2648 (fixes #5513)
 2020-07-12 15:27:49 +04:00
Evil Eye
271f7040a6 Fix a regression caused by #2648 (fixes #5513) 2020-07-12 13:25:40 +02:00
Andrei Kortunov
7f936e4cde
Merge pull request #2961 from akortunov/move 
Do not use outdated references when moving objects to new cells
 2020-07-12 12:11:22 +04:00
AnyOldName3
22c5c7a96e Build the CS again. 
Maybe this will work now the cache isn't trash
 2020-07-12 03:18:56 +01:00
AnyOldName3
ef451fa266 Revert "Runner now supports sensible globbing patterns" & "Maybe this will make globbing work" 
Runner *actually* only supports sensible globbing patterns for cache,
not artifacts.

This reverts commits 24129e8a54 and 094f0d1772.
 2020-07-12 03:17:46 +01:00
AnyOldName3
094f0d1772 Maybe this will make globbing work 2020-07-11 22:46:12 +01:00
Bret Curtis
3acb84f4d5
Merge pull request #2964 from elsid/osg_rendering_stats 
Report OSG rendering stats to file
 2020-07-11 23:45:26 +02:00
Roman Siromakha
0f6badc581
Merge pull request #2958 from akortunov/statswatcher 
Corrections for StatsWatcher
 2020-07-11 22:54:35 +02:00
AnyOldName3
24129e8a54 Runner now supports sensible globbing patterns 2020-07-11 20:40:36 +01:00
AnyOldName3
699ec9e06e separate caches for MSBuild and Ninja 2020-07-11 17:52:42 +01:00
Andrei Kortunov
78627d66bc
Merge pull request #2963 from elsid/fix_particle_tsan 
Add bug #4764 to changelog
 2020-07-11 20:50:01 +04:00
Andrei Kortunov
da791590ac Update HUD icons during mechanics update again to avoid crashes 2020-07-11 20:40:00 +04:00
elsid
db0ad8421f
Report OSG rendering stats 2020-07-11 18:32:57 +02:00
elsid
bdf215d1a9
Add bug #4764 to changelog 2020-07-11 18:32:33 +02:00
Andrei Kortunov
58e3900ea0 Avoid redundant call 2020-07-11 20:11:49 +04:00
AnyOldName3
81aed34588 variables should be a hash of key value pairs 2020-07-11 16:54:13 +01:00
AnyOldName3
3862f0d10a Migrate variable names 
Some of the built-ins were deprecated/removed
 2020-07-11 16:42:15 +01:00
AnyOldName3
a9e6bf11c2 Configurations (via inheritance) 2020-07-11 16:36:21 +01:00
Bret Curtis
9124a18bb6
Merge pull request #2959 from elsid/fix_particle_tsan 
Fix TSAN warnings for ripples emitter (bug #4764)
 2020-07-11 17:22:24 +02:00
Andrei Kortunov
db8f0ad6fd Do not use outdated references when moving objects to new cells (bug #5387) 2020-07-11 17:24:20 +04:00
elsid
a4e3f32ec8
Fix TSAN warnings for ripples emitter 
While main thread creates particles rendering thread draws them so
sychronization is required.
 2020-07-11 13:29:30 +02:00
psi29a
b372ac9119 Merge branch '#5493_better_handle_objects_across_cells' into 'master' 
Resolve #5493 by better supporting objects that are placed across cells.

Closes #5493

See merge request OpenMW/openmw!260
 2020-07-11 08:27:27 +00:00
AnyOldName3
c29a1c2567 ninja: error: unknown target 'openwm', did you mean 'openmw'? 2020-07-11 03:52:54 +01:00
AnyOldName3
1bb54a28bc Build fewer targets 
Most importantly, skip the CS. This should bring the build time under an hour.
 2020-07-11 03:23:15 +01:00
AnyOldName3
38f1eae575 Merge remote-tracking branch 'upstream/master' into yet-another-windows-shared-runner-attempt 2020-07-11 01:19:36 +01:00
Bret Curtis
4a17bf27a3 Set BULLET_ROOT via add_cmake_opts like we do the rest 2020-07-11 00:18:14 +02:00
psi29a
15c5cf42c0 Merge branch '#5517_ag_rotate_object_fix' into 'master' 
Resolves #5517 by removing the object being rotated from the paging system.

Closes #5517

See merge request OpenMW/openmw!259
 2020-07-10 18:09:42 +00:00
Bret Curtis
f47d2bb8af make sure we use case-sensative BULLET_ prefix 2020-07-10 15:01:44 +02:00
psi29a
7300496a5f Delete FindFreetype.cmake; as it is provided by cmake as of 3.0.2 and we require 3.1.0. 2020-07-10 12:27:22 +00:00
psi29a
5c3496fb15 Delete FindBullet.cmake; we use cmake's version which has been available since 3.0.2 and we have a requirement of 3.1.0 
https://cmake.org/cmake/help/v3.0/module/FindBullet.html
 2020-07-10 12:22:58 +00:00
psi29a
721e659d37 Update CHANGELOG.md 2020-07-10 12:12:07 +00:00
psi29a
8f86617262 Merge branch 'master' into 'master' 
Fixed passed indexes for object deletion #5384

See merge request OpenMW/openmw!196
 2020-07-10 12:10:33 +00:00
psi29a
c3a44212c7 Merge branch 'player_resurrection_spell_fix' into 'master' 
Don't clear spells for a dead player, preventing resurrection problems

See merge request OpenMW/openmw!207
 2020-07-10 12:00:24 +00:00
Andrei Kortunov
8517737ac0 Merge branch 'camera_dist_setting' into 'master' 
New setting "third person camera distance"

See merge request OpenMW/openmw!241
 2020-07-10 03:42:15 +00:00
Bret Curtis
fd61ebf6ab remove big white blob of space 2020-07-10 00:44:54 +02:00
Petr Mikheev
280862f58b New setting "third person camera distance" 2020-07-10 00:38:18 +02:00
bzzt lost a hitlab login
4ea018c594 Should resolve #5493 by better supporting objects that are placed across cells. 2020-07-09 23:17:01 +02:00
Bret Curtis
bbba524a6c Resolves #5517 by removing the object being rotated from the paging system. 2020-07-09 22:36:57 +02:00
psi29a
46db69a349 Merge branch 'swimming' into 'master' 
Swimming-related fixes

See merge request OpenMW/openmw!247

(cherry picked from commit 8be328ef80f29e9692e29d24beefa8ced16537a7)

738c71fd Extend the "turn to movement direction" mode for swimming up and down.
10d3e82b New setting "swim upward coef"
 2020-07-09 20:05:59 +00:00
Andrei Kortunov
e335dc8b8a
Merge pull request #2957 from elsid/sound_lookup_when_fade_out 
Lookup sound when need to fade out
 2020-07-09 10:25:16 +04:00
elsid
1c9ce03575
Lookup sound when need to fade out 2020-07-08 22:43:16 +02:00
Andrei Kortunov
700f70595f
Merge pull request #2956 from elsid/sound_reoder_conditions 
Check distance to object before load sound
 2020-07-08 08:53:20 +04:00
elsid
41434f26a6 Merge branch 'Fix-Trainers-Issue-5486' into 'master' 
Trainers training skills based on base skill issue #5486

See merge request OpenMW/openmw!257
 2020-07-07 20:25:21 +00:00
elsid
624baa6d89
Check distance to object before load sound 2020-07-07 21:19:00 +02:00
CedricMocquillon
d76b81a4a4 Update changelog 2020-07-07 17:54:42 +02:00
CedricMocquillon
e51191b5ca Update documentation 2020-07-07 17:54:31 +02:00
CedricMocquillon
096e25b29a Make the getSkillForTraining a member method of TrainingWindow class. 
The implementation is based now on the member of the class
mTrainingSkillBasedOnBaseSkill instead of local static
 2020-07-07 11:13:35 +02:00