Commit Graph

32979 Commits (macos_ci_fix)
 

Author SHA1 Message Date
psi29a 6a6550028d Update 2 files
- /CI/before_script.osx.sh
- /CI/before_install.osx.sh
4 months ago
psi29a 411c920694 Update file before_install.osx.sh 4 months ago
psi29a c21e7d3490 Update file before_install.osx.sh 4 months ago
psi29a 27679116b1 Update file before_install.osx.sh 4 months ago
psi29a 681a244c70 Update file before_install.osx.sh 4 months ago
psi29a a44ef90e95 Update file before_install.osx.sh 4 months ago
psi29a 6ee5332921 Update file before_script.osx.sh 4 months ago
psi29a 2baccefeb3 Update file before_install.osx.sh 4 months ago
psi29a 7300bab7cd Update file before_install.osx.sh 4 months ago
psi29a 9fa27a98be qt5 for now 4 months ago
psi29a 8391f54ca5 bad hack workaround 4 months ago
psi29a 873c99feb4 Update file before_install.osx.sh 4 months ago
psi29a 856d04505d Qt was not well installed 4 months ago
psi29a 9c227a59d5 purge more, find stuf 4 months ago
psi29a 3bfb9aa4a3 Update file before_install.osx.sh 4 months ago
psi29a 88ffcddb42 Update file before_install.osx.sh 4 months ago
psi29a 9dcb7bb3bc no really, qt please 4 months ago
psi29a 55ee0f67e4 purge php and its deps 4 months ago
psi29a fc6c94fc25 Update file before_install.osx.sh 4 months ago
Alexei Kotov 78459314bf Merge branch 'impartialplayerbelike' into 'master'
Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us

Closes #7645

See merge request OpenMW/openmw!3650
4 months ago
jvoisin 31ac993374 Merge branch 'allthatglitters' into 'master'
Use NAM9 for stack count

Closes #2566

See merge request OpenMW/openmw!3698
4 months ago
Evil Eye e63933efa6 Use NAM9 for stack count 4 months ago
jvoisin 6180ad0e51 Merge branch 'sunlighting' into 'master'
Fix interior sun direction (bug #7585)

Closes #7585

See merge request OpenMW/openmw!3699
4 months ago
jvoisin db0d78ba24 Merge branch 'normalizednormals' into 'master'
Don't handle per-vertex normals as tangent space normals (#7748)

See merge request OpenMW/openmw!3704
4 months ago
Evil Eye c97d0b5252 Merge branch 'weather' into 'master'
Make rain and snow ripple settings global rather than per-weather (#7748)

See merge request OpenMW/openmw!3706
4 months ago
Alexei Kotov 7e162a0d7c Merge branch 'lua_real_frame_time' into 'master'
Pass real frame duration to onFrame

See merge request OpenMW/openmw!3621
4 months ago
Alexei Kotov 0f9eb3d85a Merge branch 'editor_double_settings' into 'master'
Use settings values to declare double settings (#6876)

See merge request OpenMW/openmw!3701
4 months ago
Alexei Kotov 8a91e7057f Merge branch 'ref_id_universal_id' into 'master'
Fix RefId based UniversalId (#7747)

Closes #7747

See merge request OpenMW/openmw!3702
4 months ago
psi29a 7647af6e4e Merge branch 'friendlyhit' into 'master'
Correct friendly fire reaction for different damage sources (bug #7646)

Closes #7646

See merge request OpenMW/openmw!3694
4 months ago
psi29a 67955ac55f Merge branch 'treejunk' into 'master'
Discard additional tokens in non-expression contexts

See merge request OpenMW/openmw!3700
4 months ago
psi29a cb24475662 Merge branch 'what-a-selection-you-have' into 'master'
Feat(CS): Add More Selection Controls

See merge request OpenMW/openmw!3674
4 months ago
uramer c23858bf1c Merge branch 'playercontrols' into 'master'
Remove duplicate ToggleWeapon trigger handler registration

See merge request OpenMW/openmw!3705
4 months ago
Alexei Kotov 640fa53bb8 Make rain and snow ripple settings global rather than per-weather (#7748) 4 months ago
Alexei Kotov 91a01ae1e2 Remove duplicate ToggleWeapon trigger handler registration 4 months ago
Alexei Kotov f83a7b711a Don't handle per-vertex normals as tangent space normals 4 months ago
Evil Eye 01eb333fad Merge branch 'generic_object_cache' into 'master'
Refactor GenericObjectCache and add unit tests

See merge request OpenMW/openmw!3689
4 months ago
psi29a e9f3e5c6d1 Merge branch 'lua_actions_electric_boogaloo' into 'master'
Lua actions take 3

See merge request OpenMW/openmw!2628
4 months ago
uramer 0e2e386dc9 Lua actions take 3 4 months ago
Evil Eye 3f6c3e24f4 Merge branch 'autoequipcrash' into 'master'
Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll (#7744)

Closes #7744

See merge request OpenMW/openmw!3697
4 months ago
elsid 39dd73263d
Avoid converting UniversalId to a different type via string 4 months ago
elsid 7b5310b569
Write StringRefId as is when converting UniversalId to string
To avoid adding quotes which on conversion ESM::StringRefId -> UniversalId ->
std::string -> UniversalId changes the string value adding quotes.
4 months ago
psi29a 2fde1ef3d8 Merge branch 'bodypartanimation' into 'master'
NpcAnimation: Assign parent animation time sources to body part controllers (bug #4822)

Closes #4822

See merge request OpenMW/openmw!3653
4 months ago
elsid 0fc78aa173
Make ESM::StringRefId compatible with std::string UniversalId 4 months ago
Alexei Kotov abbbd8cf69 Fix interior sun direction (bug #7585) 4 months ago
Cody Glassman c53abd870b Merge branch 'waterscatter' into 'master'
Use sun visibility for sunlight scattering (bug #7309)

Closes #7309

See merge request OpenMW/openmw!3478
4 months ago
elsid 088d4ee5ce
Use settings values to declare double settings 4 months ago
elsid 7a817d3147
Apply project naming styleguide to GenericObjectCache 4 months ago
elsid 45b1b4f1e0
Remove redundant ObjectCacheMap alias 4 months ago
elsid 7b1ee2780b
Use ranged for loops in GenericObjectCache 4 months ago
elsid 2f0613c8d4
Remove user defined destructor for GenericObjectCache 4 months ago