1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-23 15:23:52 +00:00
Commit graph

27414 commits

Author SHA1 Message Date
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
Thomas Lowe
3daa716090 Updated button description. 2021-12-03 06:45:54 -05:00
elsid
7dcb219ecf
Add raw heightfield data to navigator 2021-12-03 01:16:15 +01:00
elsid
8571c317d8
Add raw water data to navigator 2021-12-03 01:16:15 +01:00
elsid
f4f4458d01
Calculate recast mesh bounds when building navmesh 2021-12-03 01:16:15 +01:00
elsid
e10bbb9ad7
Shift heightfield and water in navigator tests 2021-12-03 01:16:15 +01:00
Petr Mikheev
e2c896e4ce Merge branch 'lua_ui_data' into 'master'
Add a data field to Lua UI layouts

See merge request OpenMW/openmw!1429
2021-12-02 21:52:29 +00:00
uramer
e65c946452 Add a data field to Lua UI layouts 2021-12-02 21:52:29 +00:00
Evil Eye
58b888a38e Preserve inventories when resurrecting actors while looting them 2021-12-02 20:36:42 +01:00
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
2021-12-02 17:01:40 +00:00
andrew-app
13400b2c5f Bug #5434: Pinned windows shouldn't cover breath progress bar 2021-12-02 17:01:40 +00:00
psi29a
7256654f29 Merge branch 'navmesh_render' into 'master'
Rework navmesh render (#6187)

See merge request OpenMW/openmw!1338
2021-12-02 10:34:41 +00:00
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
2021-12-02 08:04:32 +00:00
Ivan Beloborodov
ead0cb5ce0 #6419 Topic shouldn't be greyed out if they can produce another topic reference. 2021-12-02 08:04:29 +00:00
jvoisin
693880cc40 Merge branch 'fix-static-urls' into 'master'
Combine daily and on-push build declarations

See merge request OpenMW/openmw!1445
2021-12-01 21:43:32 +00:00
AnyOldName3
a680952434 Combine daily and on-push build declarations 2021-12-01 21:43:31 +00:00
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
2021-12-01 21:39:54 +00:00
Evil Eye
dca0fa0a41 Remove teleportation effects after they've been applied 2021-12-01 21:39:53 +00:00
Evil Eye
893d569529 Force the loot UI open if it was open while resurrecting the lootee 2021-12-01 18:21:21 +01:00
psi29a
3de8645be9 Merge branch 'stats' into 'master'
Small QOL improvement for osg_stats

See merge request OpenMW/openmw!1451
2021-12-01 15:30:20 +00:00
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. 2021-12-01 15:24:35 +01:00
fredzio
b02560bbae Add a precision parameter to format floating point number in stats mode 2021-12-01 11:18:22 +01:00
Thomas Lowe
f50cbcad81 * AA combo box no longer disables the AA alpha test checkbox.
* Updated AA alpha test description to be more accurate
2021-11-30 20:07:29 -05:00
Evil Eye
f1ec8db393 Make Set- and ModStat behave as they should 2021-11-30 19:39:15 +01:00
psi29a
a9008d224a Merge branch 'light_refactors' into 'master'
LightManager consolidation

Closes #6389

See merge request OpenMW/openmw!1400
2021-11-30 16:02:28 +00:00
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
2021-11-30 16:00:31 +00:00
OnlyForF1
c5b33185b5 Recalculate the Projection Matrix every time the window is resized. 2021-11-30 16:00:30 +00:00
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
2021-11-30 15:59:06 +00:00
psi29a
12167291a3 Merge branch 'plz_no_particles' into 'master'
Hopefully fix #6353 once and for all

Closes #6353

See merge request OpenMW/openmw!1433
2021-11-30 15:57:38 +00:00
psi29a
cb38ec7e7f Merge branch 'fix_unity_build' into 'master'
Fix unity build (#6436)

Closes #6436

See merge request OpenMW/openmw!1417
2021-11-30 15:53:39 +00:00
psi29a
a332dec681 Merge branch 'fix_esm_loader' into 'master'
Load only supported content formats by EsmLoader

See merge request OpenMW/openmw!1427
2021-11-30 15:51:22 +00:00
psi29a
a15cc0959f Merge branch 'murmur_hash' into 'master'
Use MurmurHash3_x64_128 for Files::getHash

See merge request OpenMW/openmw!1404
2021-11-30 15:50:11 +00:00
psi29a
8d1baa9ae0 Merge branch 'refactor_content_loader' into 'master'
Refactor MWWorld::ContentLoader and derived classes

See merge request OpenMW/openmw!1432
2021-11-30 15:36:19 +00:00
Thomas Lowe
95d7bdd0c9 alpha test defaults to false 2021-11-30 07:50:30 -05:00
Thomas Lowe
bdb7b6079e Removed a period from the checkbox's display text to conform with other buttons. 2021-11-29 20:49:31 -05:00
Thomas Lowe
4f77c18af4 Removed unneeded signal. 2021-11-29 20:44:47 -05:00
elsid
c4cd2f36c3
Move convertMagicEffects into separate file
As completely unrelated to EsmLoader.
2021-11-29 22:45:35 +01:00
elsid
47219b4def
Avoid base class call antipattern in classes derived from ContentLoader 2021-11-29 22:45:08 +01:00
AnyOldName3
b991263a92 Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89062 2021-11-29 20:16:49 +00:00
Bret Curtis
246912f73a
Merge pull request #3206 from akortunov/groundcover_loading
Use a separate storage for groundcover data
2021-11-29 20:09:21 +01:00