Commit Graph

27046 Commits (0bbf9a5499ddd9700a56349a6d18a94d2c15f8bc)
 

Author SHA1 Message Date
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
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
psi29a 1654bebfc8 Merge branch 'master' into 'master'
#6419 Topic shouldn't be greyed out if they can produce another topic reference.

See merge request OpenMW/openmw!1442
3 years ago
Ivan Beloborodov ead0cb5ce0 #6419 Topic shouldn't be greyed out if they can produce another topic reference. 3 years ago
jvoisin 693880cc40 Merge branch 'fix-static-urls' into 'master'
Combine daily and on-push build declarations

See merge request OpenMW/openmw!1445
3 years ago
AnyOldName3 a680952434 Combine daily and on-push build declarations 3 years ago
jvoisin 31170c3842 Merge branch 'yet_another_magical_regression' into 'master'
Remove teleportation effects after they've been applied

Closes #6460

See merge request OpenMW/openmw!1453
3 years ago
Evil Eye dca0fa0a41 Remove teleportation effects after they've been applied 3 years ago
Evil Eye 893d569529 Force the loot UI open if it was open while resurrecting the lootee 3 years ago
psi29a 3de8645be9 Merge branch 'stats' into 'master'
Small QOL improvement for osg_stats

See merge request OpenMW/openmw!1451
3 years ago
fredzio 3754e59de0 Add a regexp_match flag for keys used in stats and timeseries. When set, the argument given is considered a regexp against which the keys are matched. 3 years ago
fredzio b02560bbae Add a precision parameter to format floating point number in stats mode 3 years ago
psi29a a9008d224a Merge branch 'light_refactors' into 'master'
LightManager consolidation

Closes #6389

See merge request OpenMW/openmw!1400
3 years ago
psi29a e221013692 Merge branch 'recalculate-projection-matrix-on-window-resize' into 'master'
Recalculate the Projection Matrix every time the window is resized.

See merge request OpenMW/openmw!1382
3 years ago
OnlyForF1 c5b33185b5 Recalculate the Projection Matrix every time the window is resized. 3 years ago
psi29a 7f2c0df3fd Merge branch 'follow_the_path_of_peace' into 'master'
Remove allies from combat when stopping combat

Closes #1930

See merge request OpenMW/openmw!1441
3 years ago
psi29a 12167291a3 Merge branch 'plz_no_particles' into 'master'
Hopefully fix #6353 once and for all

Closes #6353

See merge request OpenMW/openmw!1433
3 years ago
psi29a cb38ec7e7f Merge branch 'fix_unity_build' into 'master'
Fix unity build (#6436)

Closes #6436

See merge request OpenMW/openmw!1417
3 years ago
psi29a a332dec681 Merge branch 'fix_esm_loader' into 'master'
Load only supported content formats by EsmLoader

See merge request OpenMW/openmw!1427
3 years ago
psi29a a15cc0959f Merge branch 'murmur_hash' into 'master'
Use MurmurHash3_x64_128 for Files::getHash

See merge request OpenMW/openmw!1404
3 years ago
psi29a 8d1baa9ae0 Merge branch 'refactor_content_loader' into 'master'
Refactor MWWorld::ContentLoader and derived classes

See merge request OpenMW/openmw!1432
3 years ago