Commit Graph

27070 Commits (3baf966219896571cb3a05c45dcae45a46ae3651)
 

Author SHA1 Message Date
psi29a 3baf966219 Merge branch 'msvc-only-precompile' into 'master'
Only precompile headers with MSVC

See merge request OpenMW/openmw!1467
3 years ago
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
3 years ago
psi29a 0f1f34baa5 Merge branch 'case_insensitive_formats' into 'master'
Check extension in lower case

See merge request OpenMW/openmw!1466
3 years ago
AnyOldName3 221e425fe6 Only precompile headers with MSVC 3 years ago
Bret Curtis 454ddfa304
Merge pull request #3224 from Vulpen/feature-AA-alpha-test
Issue #6019 AA Alpha Test Option In Launcher
3 years ago
Thomas Lowe fd025f6991 Added my name to authors list! 3 years ago
elsid 5129ab39fc
Check extension in lower case 3 years ago
Evil Eye 4b67fe5351 Actually remove effects before proclaiming they've been removed 3 years ago
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
3 years ago
psi29a e04e139f37 Merge branch 'navmesh_raw' into 'master'
Add to navigator unmodified water and heightfield data

See merge request OpenMW/openmw!1373
3 years ago
Bret Curtis 9336626927 use OPENMW_RESOURCES_ROOT instead 3 years ago
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 3 years ago
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
3 years ago
psi29a b62b144ec0 Switch to Ubuntu Focal for now, until Debian gets latest MyGUI. 3 years ago
psi29a 0bbf9a5499 Added !1420 3 years ago
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
3 years ago
psi29a 59ab947f3b Merge branch 't800' into 'master'
Keep only one '\0' in NIF strings (bug #6473)

Closes #6473

See merge request OpenMW/openmw!1458
3 years ago
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
3 years ago
psi29a 6c7dc2d72f Merge branch 'assorted' into 'master'
Load NiSortAdjustNode and NiAccumulators

See merge request OpenMW/openmw!1396
3 years ago
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
3 years ago
psi29a 7c641bffd7 Merge branch 'coverity_info' into 'master'
Show the coverity log in the CI

See merge request OpenMW/openmw!1460
3 years ago
psi29a 4de43e6d1d Merge branch 'remove_badges' into 'master'
Remove the two last badges from the README

See merge request OpenMW/openmw!1461
3 years ago
psi29a 82cc4b802c Merge branch 'broken_osx' into 'master'
Remove OSX 10.15

See merge request OpenMW/openmw!1462
3 years ago
Alexei Kotov f184201415 Merge branch 'admirable' into 'master'
Cap temp disposition change properly

See merge request OpenMW/openmw!1459
3 years ago
jvoisin 17560683c6 Remove OSX 10.15
This has been broken for a while on gitlab's side.
3 years ago
jvoisin 30a351a118 Remove the two last badges from the README
They're already proudly displayed on gitlab: https://gitlab.com/OpenMW/openmw
3 years ago
jvoisin 9d694c2184 Show the coverity log in the CI 3 years ago
Evil Eye 99bfe024ef Cap temp disposition change properly 3 years ago
jvoisin 2dd780b4a3 Merge branch 'art' into 'master'
Aggressively prune/expire unnecessary artifacts

See merge request OpenMW/openmw!1457
3 years ago
jvoisin e2ca5288c2 Aggressively prune/expire unnecessary artifacts 3 years ago
Alexei Dobrohotov dd15b30a27 Keep only one '\0' in NIF strings (bug #6473) 3 years ago
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
3 years ago
uramer 15c7bddd57 Move SDL-MyGUI input mappings to components, map both ways 3 years ago
Evil Eye 856f336365 Merge branch 'precompiled_sol' into 'master'
Precompile sol.hpp in order to reduce compilation time.

See merge request OpenMW/openmw!1390
3 years ago
Petr Mikheev d3df3efaf1 Precompile sol.hpp in order to reduce compilation time. 3 years ago
Evil Eye 4d346fefd6 Merge branch 'regionnotfound' into 'master'
Raise a warning when entering non-existent region

Closes #6358

See merge request OpenMW/openmw!1454
3 years ago
Kindi 47ff6a87a3 Raise a warning when entering non-existent region 3 years ago
psi29a f19b315651 Update .resubmitted_merge_requests.txt 3 years ago
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
3 years ago
Thomas Lowe 3daa716090 Updated button description. 3 years ago
elsid 7dcb219ecf
Add raw heightfield data to navigator 3 years ago
elsid 8571c317d8
Add raw water data to navigator 3 years ago
elsid f4f4458d01
Calculate recast mesh bounds when building navmesh 3 years ago
elsid e10bbb9ad7
Shift heightfield and water in navigator tests 3 years ago
Petr Mikheev e2c896e4ce Merge branch 'lua_ui_data' into 'master'
Add a data field to Lua UI layouts

See merge request OpenMW/openmw!1429
3 years ago
uramer e65c946452 Add a data field to Lua UI layouts 3 years ago
Evil Eye 58b888a38e Preserve inventories when resurrecting actors while looting them 3 years ago
Evil Eye b35cb038d0 Merge branch 'drowningbar' into 'master'
Bug #5434: Pinned windows shouldn't cover breath progress bar

Closes #5434

See merge request OpenMW/openmw!1448
3 years ago
andrew-app 13400b2c5f Bug #5434: Pinned windows shouldn't cover breath progress bar 3 years ago
psi29a 7256654f29 Merge branch 'navmesh_render' into 'master'
Rework navmesh render (#6187)

See merge request OpenMW/openmw!1338
3 years ago