mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-23 01:23:52 +00:00
Code Issues Releases Wiki Activity
29705 commits 108 branches 66 tags 133 MiB
Commit graph

29705 commits

This branch
This branch
All branches
Author SHA1 Message Date
psi29a
523fabe1e8 Merge branch 'fix_settings_reloadlua' into 'master' 
Clear storage of setting groups on reloadlua

See merge request OpenMW/openmw!2497
 2022-11-07 11:46:06 +00:00
psi29a
c2b495a187 Merge branch 'fix_7056' into 'master' 
Add missing content=builtin.omwscripts if openmw is started via openmw-cs

Closes #7056

See merge request OpenMW/openmw!2496
 2022-11-07 11:44:35 +00:00
uramer
1789160057 Clear storage of setting groups on reloadlua 2022-11-06 19:36:58 +01:00
elsid
baa39c06bb
Move fourCC to a separate file 2022-11-06 15:35:16 +01:00
Petr Mikheev
6025943fed Add missing content=builtin.omwscripts if openmw is started via openmw-cs (fixes #7056) 2022-11-05 16:30:44 +01:00
Max Henzerling
897cdc62d8 Add snap to reference 2022-11-04 15:04:42 -07:00
Evil Eye
f61083d02c Replace switch statements 2022-11-04 12:20:37 +01:00
psi29a
084396f29e Merge branch 'fix_7005' into 'master' 
Fix Lua settings UI not working after a save (#7005)

See merge request OpenMW/openmw!2495
 2022-11-04 09:14:48 +00:00
Petr Mikheev
589d7e821d Fix Lua settings UI not working after a save (#7005) 2022-11-03 22:13:39 +01:00
Evil Eye
29a46b0fc0 Reimplement --script-all-dialogue to be more useful to modders 2022-11-03 20:54:44 +01:00
psi29a
6960fc9304 Merge branch 'opencs_iwyu' into 'master' 
Run IWYU on the opencs

See merge request OpenMW/openmw!2481
 2022-11-02 21:41:53 +00:00
psi29a
fd176d6faf Merge branch 'shutup_no_one_cares' into 'master' 
Ignore 0 attributes on dead NPCs

See merge request OpenMW/openmw!2490
 2022-11-02 08:19:37 +00:00
psi29a
824f3b8c19 Merge branch 'time_stamp' into 'master' 
Support negative days in TimeStamp (#6981)

Closes #6981

See merge request OpenMW/openmw!2492
 2022-11-02 08:18:33 +00:00
elsid
013f56088b
Support negative days in TimeStamp 
As vanilla engine does.
 2022-11-01 22:17:39 +01:00
Evil Eye
45cd5bdbd7 Ignore 0 attributes on dead NPCs 2022-11-01 20:14:40 +01:00
psi29a
45e673564f Merge branch 'flying_position' into 'master' 
Only force adjust the player and NPCs teleported out of the active grid

See merge request OpenMW/openmw!2488
 2022-10-31 20:20:18 +00:00
jvoisin
1a326294c0 Run IWYU on the opencs 2022-10-31 21:04:01 +01:00
Evil Eye
4a48156378 Only force adjust the player and NPCs teleported out of the active grid 2022-10-31 12:29:29 +01:00
psi29a
fe67deda9b Merge branch 'less_annoying_bound' into 'master' 
Allow bound effects to be recast if they're attached to a recastable effect

See merge request OpenMW/openmw!2486
 2022-10-30 12:37:48 +00:00
Evil Eye
5448338b21 Allow bound effects to be recast if they're attached to a recastable effect 2022-10-28 23:10:47 +02:00
psi29a
2091a81e1b Merge branch 'off_by_one' into 'master' 
Fix error reporting line numbers

See merge request OpenMW/openmw!2483
 2022-10-24 18:41:20 +00:00
glassmancody.info
87c0a6e6dc fix line numbers being off by one for each jump block 2022-10-24 08:40:33 -07:00
Petr Mikheev
4f5443118e Merge branch 'fix_coroutine_crash' into 'master' 
Fix coroutine-related crashes

Closes #6996

See merge request OpenMW/openmw!2447
 2022-10-18 22:30:13 +00:00
uramer
a2fa1fe0a5 Execute async callbacks on the main Lua stack 2022-10-18 22:12:11 +02:00
uramer
8108fa0724 Merge branch 'fix_7039' into 'master' 
Fix #7039: freeze after throwing an error in a queued Lua callback

Closes #7039

See merge request OpenMW/openmw!2469
 2022-10-18 19:53:30 +00:00
uramer
b13a4f6b01 Lua coroutine crash tests 2022-10-18 21:11:31 +02:00
Evil Eye
48726eedaa Mark constant methods const 2022-10-18 20:28:35 +02:00
Evil Eye
a207b5e419 Prevent potentially returning garbage flags 2022-10-18 20:28:35 +02:00
Evil Eye
c8a594d9d2 Don't use potentially invalid cache entry 2022-10-18 20:28:35 +02:00
psi29a
bc1e0d3522 Merge branch 'grayscale_dialogue' into 'master' 
Fix dialogue issues

Closes #6419 and #7047

See merge request OpenMW/openmw!2478
 2022-10-18 15:41:56 +00:00
psi29a
d2077b5624 Merge branch 'Who-needs-PR-anyway' into 'master' 
Finally get rid of the dreaded PR changelog.

See merge request OpenMW/openmw!2472
 2022-10-17 13:11:35 +00:00
psi29a
48232bfece Merge branch 'consecutiveseriouspunches' into 'master' 
Don't process unexpected hit text keys (bug #7042)

Closes #7042

See merge request OpenMW/openmw!2473
 2022-10-17 13:11:02 +00:00
psi29a
fdf1577918 Merge branch 'lua_records' into 'master' 
Lua Armor, Static and Light record bindings

See merge request OpenMW/openmw!2341
 2022-10-17 13:10:19 +00:00
psi29a
e7e371eb14 Merge branch 'unbreak_focal' into 'master' 
add some memory

See merge request OpenMW/openmw!2479
 2022-10-17 13:09:18 +00:00
psi29a
da9cbbce8f add some memory 2022-10-17 13:09:17 +00:00
Evil Eye
a24e9e4c0a Mark constant methods const 2022-10-17 09:43:20 +02:00
Evil Eye
81f138cea0 Prevent potentially returning garbage flags 2022-10-17 09:37:56 +02:00
Evil Eye
1c17260d87 Don't use potentially invalid cache entry 2022-10-17 09:35:43 +02:00
psi29a
1924a3a694 Merge branch 'floatingpointtypefish' into 'master' 
Only prevent initially dead actors from floating up (bug #4204)

Closes #4204

See merge request OpenMW/openmw!2476
 2022-10-16 17:26:00 +00:00
Alexei Kotov
ece7a98e03 Only prevent initially dead actors from floating up (bug #4204) 2022-10-14 19:35:28 +03:00
psi29a
a227bab1ae Merge branch 'fix-macos-build-without-refactoring-a-bunch-of-unrelated-files' into 'master' 
Fix MacOS build better

See merge request OpenMW/openmw!2474
 2022-10-14 11:30:19 +00:00
AnyOldName3
15c51dcbbc Restore false-positive unused includes 
They're needed on MacOS as SDL_opengl_gletx.h doesn't define them there.

They don't actually work on MacOS, so long-term, the code that uses
these defines should be changed to use #ifdef to check they're available
before using them.
 2022-10-13 00:49:24 +01:00
Alexei Kotov
eadade9dfc Don't process unexpected hit text keys (bug #7042) 2022-10-13 02:07:23 +03:00
AnyOldName3
77de37b1ed Revert "Merge branch 'fix_macos_build' into 'master'" 
As well as fixing the MacOS build, it meddled with a bunch of files that
already did the right thing.

This reverts commit 8162541a14, reversing
changes made to e16c451d08.
 2022-10-12 22:48:34 +01:00
Atahualpa
fc857d227f Finally get rid of the dreaded PR changelog. Release changelogs will be covered in our dedicated PR repo. 2022-10-12 20:08:20 +02:00
psi29a
df8bd57a9e Merge branch 'lua_testing_util' into 'master' 
Move testing_util.lua to a separate directory to be reused as a library

See merge request OpenMW/openmw!2470
 2022-10-11 06:12:18 +00:00
psi29a
2dd9284ca4 Merge branch 'stats_err_msg' into 'master' 
[Lua] Improve error message when trying to change stats from a global script

See merge request OpenMW/openmw!2468
 2022-10-11 06:11:51 +00:00
mpeco
a2ce37b5b0 clang-format 2022-10-11 01:14:17 -03:00
mpeco
e10b7e5c82 types.lua baseArmor comment 2022-10-11 00:01:12 -03:00
mpeco
fd2d9d7d1a types.lua typo 2022-10-11 00:01:12 -03:00