mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 18:19:55 +00:00
Code Issues Releases Wiki Activity
23756 commits 38 branches 54 tags 122 MiB
Commit graph

23756 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Petr Mikheev
280862f58b New setting "third person camera distance" 2020-07-10 00:38:18 +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
Bret Curtis
49489b31f7
Merge pull request #2955 from elsid/sound_npc_animation 
Use pointer to Sound to stop sounds started by NpcAnimation
 2020-07-07 08:17:03 +02:00
CedricMocquillon
998bf5da34 Add new checkbox for the new setting 'trainers training skills based on base skill' 2020-07-06 20:32:30 +02:00
CedricMocquillon
1aa4f6bf96 The number of skills points a trainer can teach is based either on its base 
values or on its modified ones depending on the new setting 'trainers training
 skills based on base skill' value
 2020-07-06 20:30:14 +02:00
CedricMocquillon
281cef9769 The 3 skill selected by a trainer are based on its 3 best skills. 
The skills are sorted either on their base value or on their modified one
depending on the new setting 'trainers training skills based on base skill'
 2020-07-06 20:28:08 +02:00
elsid
3c460fb3e9
Use pointer to Sound to stop sounds started by NpcAnimation 2020-07-06 17:38:09 +02:00
Bret Curtis
0f855a83c0
Merge pull request #2945 from OpenMW/macos10.15 
give MacOS 10.15 a spin
 2020-07-06 09:04:11 +02:00
Bret Curtis
14d5b3eeaf try release again and turning on bit by bit for ccache to be used 2020-07-06 07:47:31 +02:00
Bret Curtis
67c2f0b26c
Merge pull request #2951 from elsid/sound_object_pool 
Store SoundManager sounds and streams in object pool
 2020-07-06 07:18:46 +02:00
psi29a
f4d024b4f1 Merge branch 'ci-cache' into 'master' 
Cache compilation using ccache

See merge request OpenMW/openmw!159
 2020-07-06 05:06:09 +00:00
Icecream95
dc6fbd39d8
Cache compilation using ccache 2020-07-06 11:01:45 +12:00
Bret Curtis
2ac4a2c6e3 do not make package for now 2020-07-04 13:22:58 +02:00
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads 
Replace OpenThreads by std types
 2020-07-04 13:11:23 +02:00
Bret Curtis
db75398fba only build openmw for now 2020-07-04 11:54:19 +02:00
Bret Curtis
28d85e4030
Merge pull request #2926 from akortunov/warnfix 
Use QMultiMap instead of QMap
 2020-07-04 11:39:11 +02:00
Andrei Kortunov
57069f60aa
Merge pull request #2953 from akortunov/warnfix2 
Mark some methds as overrides to avoid warnings
 2020-07-04 12:02:04 +04:00
Andrei Kortunov
9ec61c14d2 Mark some methods as overrides to avoid warnings 2020-07-04 12:00:30 +04:00
Andrei Kortunov
ce597ff908
Merge pull request #2952 from akortunov/master 
Remove redundant virtual qualifier
 2020-07-04 10:20:46 +04:00
Andrei Kortunov
d1b5f17390 Remove redundant virtual qualifier 2020-07-04 10:17:39 +04:00
elsid
02f9b44f01
Use RAII for object ptr from pool 2020-07-04 01:15:27 +02:00
elsid
6ca29c6107
Use common type for pool of sounds and streams 2020-07-04 01:09:04 +02:00
Bret Curtis
c7a612a891
Merge pull request #2949 from elsid/sound_water_action 
Choose next action for water sound in a separate function
 2020-07-04 00:03:17 +02:00
Bret Curtis
3ea576efdc do not build a few things; temporary disable checking package; get things compiling and cached first 2020-07-03 23:24:54 +02:00
elsid
b424aac25e
Choose next action for water sound in a separate function 2020-07-03 21:04:25 +02:00
elsid
080b0d6319
Remove unused duration from updateWaterSound 2020-07-03 21:01:48 +02:00