Commit Graph

18244 Commits (810ad9d3fbc1be23f879f3cf79d99ba35dafd8fa)

Author SHA1 Message Date
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
Bret Curtis 454ddfa304
Merge pull request #3224 from Vulpen/feature-AA-alpha-test
Issue #6019 AA Alpha Test Option In Launcher
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 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 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
Evil Eye 99bfe024ef Cap temp disposition change properly 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
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
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
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
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
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
Thomas Lowe f50cbcad81 * AA combo box no longer disables the AA alpha test checkbox.
* Updated AA alpha test description to be more accurate
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 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
Thomas Lowe 4f77c18af4 Removed unneeded signal. 3 years ago
elsid c4cd2f36c3
Move convertMagicEffects into separate file
As completely unrelated to EsmLoader.
3 years ago
elsid 47219b4def
Avoid base class call antipattern in classes derived from ContentLoader 3 years ago
Bret Curtis 246912f73a
Merge pull request #3206 from akortunov/groundcover_loading
Use a separate storage for groundcover data
3 years ago
Thomas Lowe 5f355a14cd Changed default setting for anti-alias alpha test to true.
Added checkbox in advanced page for anti-alias alpha test, connected to AA combobox in the graphics page.
3 years ago
kuyondo 01a9eaf4a8 fix#6451 3 years ago
Frederic Chardon 9d7a53b701 Merge branch 'fix_physics_deadlock' into 'master'
Fix deadlock in physics system (#6414)

Closes #6414

See merge request OpenMW/openmw!1440
3 years ago
Evil Eye d6f06fbf9a Remove allies from combat when stopping combat 3 years ago
Evil Eye a231037449 Merge branch 'accumroot' into 'master'
Use the anim source to find mAccumRoot (bug #6417)

Closes #6417

See merge request OpenMW/openmw!1431
3 years ago
elsid 6b43ce0662
Fix deadlock in physics system
1. Reorder unlock and notify_all calls to avoid notifying when not all worker
   threads are waiting.
2. Make sure main thread does not attempt to exclusively lock mSimulationMutex
   while not all workers are done with previous frame.
3. Replace mNewFrame flag by counter to avoid modification from multiple
   threads.
3 years ago
Evil Eye 90f94caaaf Merge branch 'quickkeyvalidation' into 'master'
Validate Quick Keys

Closes #6433

See merge request OpenMW/openmw!1428
3 years ago
kuyondo 60a345f5cc Better indentation 3 years ago
Evil Eye fb4c611570 Merge branch 'sunglare_fix' into 'master'
Fix sunglare in sky shaders

See merge request OpenMW/openmw!1430
3 years ago
Evil Eye f18b8adfea Truncate instead of rounding to deal with negative values 3 years ago