elsid
5325495f46
Move serialization detournavigator/ -> components/
2021-12-10 23:55:04 +01:00
elsid
01c712d5f1
Split navigator settings into subtypes
...
Mostly to distinguish settings that affect properties of the generated navmesh.
2021-12-10 23:55:03 +01:00
elsid
33bb18850d
Move operator<< to debug.hpp
2021-12-10 23:55:03 +01:00
elsid
5a6b39f8e0
Store mesh source data in recast mesh
2021-12-10 23:55:02 +01:00
Evil Eye
9257c27fe1
Move target checking code so it applies to all sources
2021-12-10 18:51:37 +01:00
psi29a
0603aa131d
Merge branch 'add_job_id' into 'master'
...
Add job ID to discord notification
See merge request OpenMW/openmw!1470
2021-12-10 10:42:18 +00:00
psi29a
c7bb90b030
Merge branch 'silence' into 'master'
...
Silence apt-get install
See merge request OpenMW/openmw!1468
2021-12-10 10:41:58 +00:00
psi29a
4883cbf590
Merge branch 'detain-hash-selectively-reluctant' into 'master'
...
Get rid of EscapeHashX classes option 5 (attempt 2): Use boost::filesystem::path rules if the path starts with ", and consume the whole thing verbatim otherwise
Closes #5804
See merge request OpenMW/openmw!1436
2021-12-10 08:38:06 +00:00
elsid
f007025ced
Add job ID to discord notification
...
To easily track down where it comes from.
2021-12-09 21:23:15 +01:00
jvoisin
810ad9d3fb
Silence apt-get install
2021-12-09 20:05:33 +01:00
psi29a
3baf966219
Merge branch 'msvc-only-precompile' into 'master'
...
Only precompile headers with MSVC
See merge request OpenMW/openmw!1467
2021-12-09 18:10:47 +00:00
AnyOldName3
8fc09f8c51
Merge remote-tracking branch 'upstream/master' into detain-hash-selectively-reluctant
...
Merge conflicts included:
* One setting being removed (branch had changed its type).
* One setting's description being changed (branch had changed its type).
* List of files in components/files was changed both upstream and on the
branch.
* Upstream had changed something in a file the branch deletes.
2021-12-09 17:09:52 +00:00
psi29a
f3f385fd5e
Merge branch 'removed_isnt_remove' into 'master'
...
Actually remove effects before proclaiming they've been removed
Closes #6480
See merge request OpenMW/openmw!1465
2021-12-09 15:08:41 +00:00
psi29a
0f1f34baa5
Merge branch 'case_insensitive_formats' into 'master'
...
Check extension in lower case
See merge request OpenMW/openmw!1466
2021-12-09 15:03:05 +00:00
AnyOldName3
221e425fe6
Only precompile headers with MSVC
2021-12-09 14:59:17 +00:00
Bret Curtis
454ddfa304
Merge pull request #3224 from Vulpen/feature-AA-alpha-test
...
Issue #6019 AA Alpha Test Option In Launcher
2021-12-09 01:02:16 +01:00
Thomas Lowe
fd025f6991
Added my name to authors list!
2021-12-08 18:55:31 -05:00
elsid
5129ab39fc
Check extension in lower case
2021-12-09 00:06:33 +01:00
Evil Eye
4b67fe5351
Actually remove effects before proclaiming they've been removed
2021-12-08 17:18:08 +01:00
psi29a
ad492c5735
Merge branch 'mac_mac_great_again_lua_edition' into 'master'
...
modified builtin_scripts to be macOS aware; simplified things as the SHADER...
Closes #6459
See merge request OpenMW/openmw!1463
2021-12-08 15:10:23 +00:00
psi29a
e04e139f37
Merge branch 'navmesh_raw' into 'master'
...
Add to navigator unmodified water and heightfield data
See merge request OpenMW/openmw!1373
2021-12-08 13:36:17 +00:00
Bret Curtis
9336626927
use OPENMW_RESOURCES_ROOT instead
2021-12-08 14:33:49 +01:00
Bret Curtis
a9bf53d4ed
modified builtin_scripts to be macOS aware; simplified things as the SHADER and MYGUI dir were just pointing to the OpenMW_BINARY_DIR anyway, so removing the code duplication
2021-12-08 14:28:56 +01:00
psi29a
48573b1278
Merge branch 'switch-to-ppa' into 'master'
...
Switch to Ubuntu Focal for now, until Debian gets latest MyGUI.
See merge request OpenMW/openmw!1464
2021-12-08 09:06:11 +00:00
psi29a
b62b144ec0
Switch to Ubuntu Focal for now, until Debian gets latest MyGUI.
2021-12-08 09:06:10 +00:00
psi29a
0bbf9a5499
Added !1420
2021-12-08 07:53:10 +00:00
psi29a
694f697f61
Merge branch 'it_isnt_theft_if_they_were_dead_when_you_started' into 'master'
...
Force the loot UI open if it was open while resurrecting the lootee
Closes #6453
See merge request OpenMW/openmw!1452
2021-12-06 14:49:01 +00:00
psi29a
59ab947f3b
Merge branch 't800' into 'master'
...
Keep only one '\0' in NIF strings (bug #6473 )
Closes #6473
See merge request OpenMW/openmw!1458
2021-12-06 14:45:57 +00:00
psi29a
c844e5d045
Merge branch 'racer_recursion_limited' into 'master'
...
Check if a leveled creature is in an unloaded cell before deciding it doesn't exist
Closes #4376
See merge request OpenMW/openmw!1420
(cherry picked from commit 782371cb2e7f6653d72305090033557b53bbcf3a)
6d945da7 Check if a leveled creature is in an unloaded cell before deciding it doesn't exist
2021-12-06 13:58:35 +00:00
psi29a
6c7dc2d72f
Merge branch 'assorted' into 'master'
...
Load NiSortAdjustNode and NiAccumulators
See merge request OpenMW/openmw!1396
2021-12-06 13:49:47 +00:00
psi29a
da32bf56b4
Merge branch '6332-when-building-the-openmw-test-suite-using-the-visual-studio-2019-solution-in-debug-it-uses' into 'master'
...
Resolve "When building the openmw test suite using the Visual Studio 2019 solution in debug it uses gmock.lib instead of gmockd.lib"
Closes #6332
See merge request OpenMW/openmw!1393
2021-12-06 13:41:46 +00:00
psi29a
7c641bffd7
Merge branch 'coverity_info' into 'master'
...
Show the coverity log in the CI
See merge request OpenMW/openmw!1460
2021-12-06 13:31:44 +00:00
psi29a
4de43e6d1d
Merge branch 'remove_badges' into 'master'
...
Remove the two last badges from the README
See merge request OpenMW/openmw!1461
2021-12-06 13:28:24 +00:00
psi29a
82cc4b802c
Merge branch 'broken_osx' into 'master'
...
Remove OSX 10.15
See merge request OpenMW/openmw!1462
2021-12-06 13:15:49 +00:00
Alexei Kotov
f184201415
Merge branch 'admirable' into 'master'
...
Cap temp disposition change properly
See merge request OpenMW/openmw!1459
2021-12-06 10:35:47 +00:00
jvoisin
17560683c6
Remove OSX 10.15
...
This has been broken for a while on gitlab's side.
2021-12-06 11:07:53 +01:00
jvoisin
30a351a118
Remove the two last badges from the README
...
They're already proudly displayed on gitlab: https://gitlab.com/OpenMW/openmw
2021-12-05 23:57:37 +01:00
jvoisin
9d694c2184
Show the coverity log in the CI
2021-12-05 23:54:08 +01:00
Evil Eye
99bfe024ef
Cap temp disposition change properly
2021-12-05 18:36:35 +01:00
jvoisin
2dd780b4a3
Merge branch 'art' into 'master'
...
Aggressively prune/expire unnecessary artifacts
See merge request OpenMW/openmw!1457
2021-12-05 13:19:36 +00:00
jvoisin
e2ca5288c2
Aggressively prune/expire unnecessary artifacts
2021-12-05 13:19:36 +00:00
Alexei Dobrohotov
dd15b30a27
Keep only one '\0' in NIF strings (bug #6473 )
2021-12-05 15:56:58 +03:00
Petr Mikheev
c5e10dfa85
Merge branch 'refactor_sdlmappings' into 'master'
...
Move SDL-MyGUI input mappings to components, map both ways
See merge request OpenMW/openmw!1444
2021-12-04 12:16:38 +00:00
uramer
15c7bddd57
Move SDL-MyGUI input mappings to components, map both ways
2021-12-04 12:16:38 +00:00
Evil Eye
856f336365
Merge branch 'precompiled_sol' into 'master'
...
Precompile sol.hpp in order to reduce compilation time.
See merge request OpenMW/openmw!1390
2021-12-04 11:32:39 +00:00
Petr Mikheev
d3df3efaf1
Precompile sol.hpp in order to reduce compilation time.
2021-12-04 11:32:39 +00:00
Evil Eye
4d346fefd6
Merge branch 'regionnotfound' into 'master'
...
Raise a warning when entering non-existent region
Closes #6358
See merge request OpenMW/openmw!1454
2021-12-03 16:05:18 +00:00
Kindi
47ff6a87a3
Raise a warning when entering non-existent region
2021-12-03 16:05:18 +00:00
psi29a
f19b315651
Update .resubmitted_merge_requests.txt
2021-12-03 13:39:39 +00:00
Petr Mikheev
620748480b
Merge branch 'lua_missing_key_codes' into 'master'
...
Lua binding for SDL_GetKeyName, two missing scan codes
See merge request OpenMW/openmw!1450
(cherry picked from commit d86e7d4c9a28bc96af0a5638b26879fa49b8a847)
9a073baa Add Apostrophe and Period scan codes
d66f3a35 Add getKeyName to Lua input API
ed64add9 Replace mentions of KeyEvent with KEY
2021-12-03 13:35:57 +00:00