mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-28 14:53:58 +00:00
Code Issues Projects Releases Wiki Activity
26,987 Commits 18 Branches 66 Tags
Commit Graph

26987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Petr Mikheev
f9136d4392 Support multiple arguments in Lua callbacks. 2021-11-21 13:12:35 +01:00
psi29a
3ea4305a60 Merge branch 'move-essimporter-ci' into 'master' 
Move essimporter to CS CI job

See merge request OpenMW/openmw!1414
 2021-11-21 09:44:39 +00:00
psi29a
53e14eb238 Merge branch 'reset' into 'master' 
AI reset argument

Closes #6177 and #1465

See merge request OpenMW/openmw!1405
 2021-11-21 09:39:55 +00:00
AnyOldName3
ebe8ba717e Move essimporter to CS CI job 
It's the only thing that won't impact most users, and might buy enough
seconds to stop the CI timeouts.
 2021-11-21 02:30:57 +00:00
AnyOldName3
3d381bf0d3 Merge branch 'depth_refactor' into 'master' 
Depth refactor

See merge request OpenMW/openmw!1326
 2021-11-21 02:25:06 +00:00
Cody Glassman
d85f772269 Depth refactor 2021-11-21 02:25:05 +00:00
AnyOldName3
d298260232 Merge branch 'fix_6431' into 'master' 
Fix #6431

Closes #6431

See merge request OpenMW/openmw!1413
 2021-11-21 02:23:03 +00:00
Petr Mikheev
5f195b7576 Make arguments passed to LuaManager::synchronizedUpdate consistent with arguments passed to LuaManager::update. Fixes #6431. 2021-11-21 01:48:28 +01:00
AnyOldName3
a9d7598532 Merge branch 'camera2' into 'master' 
Dehardcode camera

See merge request OpenMW/openmw!1030
 2021-11-20 18:17:12 +00:00
psi29a
a49377be65 Merge branch 'slash_osx' into 'master' 
Get rid of problematic / in branch name on OSX

Closes #6424

See merge request OpenMW/openmw!1412
 2021-11-20 18:09:50 +00:00
psi29a
adc3bab51e Merge branch 'Embedded-error-marker' into 'master' 
Embed marker error

See merge request OpenMW/openmw!1383
 2021-11-20 18:07:13 +00:00
jvoisin
85c8c91bcc Get rid of problematic / in branch name on OSX 
Taken from https://devhints.io/bash

Should fix #6424
 2021-11-20 12:55:36 +01:00
Cédric Mocquillon
eb75e394b3 Use Files::MemBuf for Bsa::MemoryInputStream base classe instead of making a duplicate (MemoryInputStreamBuf) 2021-11-20 11:12:08 +01:00
Cédric Mocquillon
8a7b4649f0 Update changelog 2021-11-20 11:12:08 +01:00