1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:19:55 +00:00
Commit graph

24373 commits

Author SHA1 Message Date
psi29a
64913dea9d Merge branch 'macos_lz4' into 'master'
MacOS and LZ4

See merge request OpenMW/openmw!356
2020-10-20 21:34:53 +00:00
Bret Curtis
06689cfe2a bingo; cleanup 2020-10-20 23:22:37 +02:00
Bret Curtis
8b5aa4c001 try for link overwriting 2020-10-20 23:06:08 +02:00
Bret Curtis
c3b464a0c8 brew reinstall lz4; purge /tmp/openmw-deps just in case 2020-10-20 23:00:37 +02:00
Bret Curtis
0719b75307 try to use brew version of lz4 2020-10-20 22:28:09 +02:00
Evil Eye
f62905eb0a remove redundant argument 2020-10-20 21:04:35 +02:00
psi29a
09373a757d Merge branch 'radioactive' into 'master'
Container base record mutations

See merge request OpenMW/openmw!353

(cherry picked from commit 8b33765dd414680f0074b3e115b52b291b4cb7cb)

275908a0 mutate container base records
16fca11d add changelog entry
2020-10-20 16:56:22 +00:00
psi29a
db126a2688 Merge branch 'old-liblz4-fix' into 'master'
Ensure compatibility with old liblz4

See merge request OpenMW/openmw!355
2020-10-20 16:36:06 +00:00
WW
d39aef3f5a Changed LZ4F_dctx* to LZ4F_decompressionContext_t for better compatibility. 2020-10-20 15:15:29 +00:00
Andrei Kortunov
6c591c190b Add support for service-specific refusals (feature #5580) 2020-10-20 18:58:26 +04:00
psi29a
69b52cd702 Merge branch 'layers' into 'master'
Make messageboxes overlap tooltips (bug #5639)

See merge request OpenMW/openmw!341
2020-10-20 09:14:11 +00:00
psi29a
992c82f298 Merge branch 'bsa' into 'master'
Compressed BSA support revisions

See merge request OpenMW/openmw!350
2020-10-20 09:13:17 +00:00
psi29a
7b1cd8a72f use LZ4_1.9.2 instead of LZ4_1.9.2 2020-10-20 07:35:02 +00:00
psi29a
1278d3b784 make sure to use new path and trick caching 2020-10-19 22:36:34 +00:00
psi29a
21a6fed015 Merge branch 'detect-bullet' into 'master'
Use a much simpler and assert-free check for Bullet multithreading support

See merge request OpenMW/openmw!354
2020-10-19 22:00:12 +00:00
psi29a
c0e3f1c7ce Update CI/before_script.msvc.sh 2020-10-19 21:59:44 +00:00
psi29a
b3e27fae4c use updated msvc lz4 provided by anyoldname3 2020-10-19 20:29:22 +00:00
Alexei Dobrohotov
de6d4ab44d Make messageboxes overlap tooltips (bug #5639) 2020-10-19 22:44:14 +03:00
Alexei Dobrohotov
1492ba4a53 Link against LZ4::LZ4 2020-10-19 22:36:02 +03:00
fredzio
a036183248 Use a much simpler and assert-free check for Bullet multithreading support 2020-10-19 21:31:52 +02:00
Alexei Dobrohotov
d6612eef20 Fix indentation 2020-10-19 22:31:42 +03:00
Alexei Dobrohotov
66d2b9c195 Add Skyrim SE BSA version support
Fix embedded file name loading
2020-10-19 22:31:42 +03:00
Bret Curtis
503bf7f78b added lz4 to our macos deps; let us see if that works 2020-10-19 22:31:42 +03:00
Bret Curtis
edd6a329ee tell 7z to extract to specific directory 2020-10-19 22:31:42 +03:00
Bret Curtis
e280a36701 correct filename of lz4 archive; fix indentation 2020-10-19 22:31:42 +03:00
Bret Curtis
7954dccb44 lz4 prep work; get linux and windows ready 2020-10-19 22:31:42 +03:00
Nelsson Huotari
fb4250a2b7 Strip the plugin index when looking for deleted refs. 2020-10-19 15:02:10 +03:00
psi29a
66c884be65 Merge branch 'android_build_on_gitlab' into 'master'
Android build on gitlab

See merge request OpenMW/openmw!352
2020-10-19 08:27:38 +00:00
psi29a
b222872446 Android build on gitlab 2020-10-19 08:27:38 +00:00
Bret Curtis
4e1ca82e47
Merge pull request #3019 from akortunov/warnfix
Fix override warning with MyGUI 3.4
2020-10-18 12:00:56 +02:00
Andrei Kortunov
065ed5138e Use emplace_back instead of push_back 2020-10-18 10:27:35 +04:00
Andrei Kortunov
d7fadc933f Fix override warning with MyGUI 3.4 2020-10-18 10:02:25 +04:00
psi29a
4adc689c7a Merge branch 'summoncrash' into 'master'
Avoid summon spawn if actor isn't in a cell (bug #5644)

See merge request OpenMW/openmw!351
2020-10-18 00:35:35 +00:00
Alexei Dobrohotov
f90e403bc1 Avoid summon spawn if actor isn't in a cell (bug #5644) 2020-10-18 01:42:32 +03:00
psi29a
f513ee1f1d Merge branch 'configurable_turning_delay' into 'master'
Makes the delay of turning while run configurable (part of "smooth movement")

See merge request OpenMW/openmw!349
2020-10-17 20:21:02 +00:00
psi29a
9d350ec824 Merge branch 'head_bobbing' into 'master'
Add head bobbing in first person mode

Closes #5043

See merge request OpenMW/openmw!320
2020-10-17 19:54:34 +00:00
Alexei Dobrohotov
4966cd217e Merge branch 'fix_give_way' into 'master'
Use full speed in the "NPCs give way" maneuver.

See merge request OpenMW/openmw!348
2020-10-17 17:32:09 +00:00
Petr Mikheev
9ec6fce446 Makes the delay of turning while run configurable (part of "smooth movement"). 2020-10-17 16:11:22 +02:00
Petr Mikheev
c72199155c Use full speed in the "NPCs give way" maneuver. 2020-10-17 15:33:23 +02:00
Bret Curtis
8050882baf
Merge pull request #3015 from akortunov/overrides
Mark overrided methods as overrides
2020-10-17 13:32:08 +02:00
AnyOldName3
bf45bd5802 Merge branch 'macos-runner-beta-fencing' into 'master'
Only use MacOS runners for this project

See merge request OpenMW/openmw!347
2020-10-17 00:16:39 +00:00
AnyOldName3
5e7e14c870 Only use MacOS runners for this project, not forks 2020-10-17 00:16:39 +00:00
AnyOldName3
df178ed97c Merge branch 'container-regressions' into 'master'
Fix container regressions

See merge request OpenMW/openmw!346

(cherry picked from commit b0aee6f83d4cddb0116284b197913f9687dd9cee)

95e7a22d fix container regressions
2020-10-16 22:55:10 +00:00
AnyOldName3
de7bafcbbd Merge branch 'falldamage' into 'master'
Restore fall damage

See merge request OpenMW/openmw!345
2020-10-16 19:54:00 +00:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
fredzio
978af12c2d Restore fall damage 2020-10-16 19:30:03 +02:00
Chris Djali
6326bb7d2e
Merge pull request #3016 from OpenMW/async-msvc2017-fix-final
Fix MSVC 2017
2020-10-15 22:50:03 +01:00
Chris Djali
590635906b
Fix MSVC 2017
Resolves the regression introduced with Async Physics
2020-10-15 21:02:57 +01:00
Bret Curtis
e5392cabf1
Merge pull request #3013 from OpenMW/macos_target_fix
Resolve 'shared_timed_mutex' is unavailable: introduced in macOS 10.12
2020-10-15 13:06:25 +02:00
Bret Curtis
b024518c18 Resolve 'shared_timed_mutex' is unavailable: introduced in macOS 10.12 2020-10-15 11:12:23 +02:00