mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 21:35:24 +00:00
Code Issues Projects Releases Wiki Activity
27,002 Commits 18 Branches 66 Tags
Commit Graph

27002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Evil Eye
383f7eb0a5 Merge branch 'fix#6451' into 'master' 
Update spell hud first before weapon hud

Closes #6451

See merge request OpenMW/openmw!1447
 2021-11-29 18:47:16 +00:00
Kindi
5927924ebc Update CHANGELOG.md 2021-11-29 17:29:35 +00:00
kuyondo
01a9eaf4a8 fix#6451 2021-11-29 19:04:34 +08:00
Petr Mikheev
f10202dbbe Merge branch 'lua_ui_reset_properties' into 'master' 
Correctly set UI properties to defaults when passed nil

See merge request OpenMW/openmw!1439
 2021-11-28 11:31:34 +00:00
uramer
e9f8c34372 Correctly set UI properties to defaults when passed nil 2021-11-28 11:31:34 +00:00
Frederic Chardon
9d7a53b701 Merge branch 'fix_physics_deadlock' into 'master' 
Fix deadlock in physics system (#6414)

Closes #6414

See merge request OpenMW/openmw!1440
 2021-11-27 19:56:37 +00:00
Evil Eye
d6f06fbf9a Remove allies from combat when stopping combat 2021-11-25 22:00:52 +01:00
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
 2021-11-25 19:13:21 +00:00
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.
 2021-11-25 19:28:31 +01:00
psi29a
d2f447065c Merge branch 'prepare_for_glibc_2_34' into 'master' 
Prepare for glibc 2.34

See merge request OpenMW/openmw!1239
 2021-11-23 20:20:48 +00:00
Evil Eye
90f94caaaf Merge branch 'quickkeyvalidation' into 'master' 
Validate Quick Keys

Closes #6433

See merge request OpenMW/openmw!1428
 2021-11-23 19:06:26 +00:00
kuyondo
5ffd077f9e Update changelog.md 2021-11-24 01:51:03 +08:00
kuyondo
60a345f5cc Better indentation 2021-11-24 01:44:14 +08:00
Evil Eye
fb4c611570 Merge branch 'sunglare_fix' into 'master' 
Fix sunglare in sky shaders

See merge request OpenMW/openmw!1430
 2021-11-23 16:47:08 +00:00
Evil Eye
f18b8adfea Truncate instead of rounding to deal with negative values 2021-11-23 17:00:53 +01:00
kuyondo
d55682f833 remove debug code 2021-11-23 15:14:59 +08:00
kuyondo
503f0e62e7 Validate Argument is Index instead of Player 2021-11-23 14:55:50 +08:00
Alexei Dobrohotov
fd58e5ba77 Use the anim source to find mAccumRoot (bug #6417) 2021-11-23 04:53:03 +03:00
glassmancody.info
44d5c96183 sunglare fix 2021-11-22 17:35:00 -08:00
kuyondo
1b1de86b4a Validate Quick Keys 2021-11-23 04:07:10 +08:00
elsid
da0c5b54f0
Load only supported content formats by EsmLoader 2021-11-22 20:58:48 +01:00
Petr Mikheev
6f5e0e7697 Merge branch 'solve_6430' into 'master' 
Use a setting to enable Lua Action tracebacks

See merge request OpenMW/openmw!1419
 2021-11-22 19:39:47 +00:00
uramer
4a976a8e23 Use a setting to enable Lua Action tracebacks 2021-11-22 19:39:47 +00:00
Petr Mikheev
a39305b108 Merge branch 'clean_lua_ui' into 'master' 
Clear Lua-created UI on game load and reloadlua command

See merge request OpenMW/openmw!1418
 2021-11-22 19:17:36 +00:00
uramer
5b8cba7323 Clear Lua-created UI on game load and reloadlua command 2021-11-22 19:17:36 +00:00
uramer
ec52a9bea0 Merge branch 'lua_callback' into 'master' 
Support multiple arguments in Lua callbacks

See merge request OpenMW/openmw!1416
 2021-11-22 18:48:59 +00:00
elsid
a665a38aca
Use MurmurHash3_x64_128 for file hash 2021-11-21 17:05:59 +01:00
elsid
f85053d78c
Support unaligned blocks 2021-11-21 16:22:58 +01:00
elsid
86bf9d5b8d
Support 128bit seed for MurmurHash3_x64_128 2021-11-21 16:22:58 +01:00
elsid
d04d4ab499
Add MurmurHash3_x64_128 implementation 
Sources:
92cf3702fc/src/MurmurHash3.h
92cf3702fc/src/MurmurHash3.cpp

Other hash functions and unused implementation details are removed.
 2021-11-21 16:22:57 +01:00
elsid
ce7f8c90f8
Fix unity build 2021-11-21 14:24:18 +01:00