Commit graph

14968 commits

Author SHA1 Message Date
Zwip-Zwap Zapony
c2aa6d4c74 Fix captions being over-affected by GUI scale
Captions' pop-in animation now starts 8 GUI pixels above the resting position, instead of (2 x GUI scale) GUI above it
2023-10-31 13:14:36 +01:00
Zwip-Zwap Zapony
36e20ac619 Tiny caption loop optimisation 2023-10-31 13:10:39 +01:00
Lactozilla
4e446d22d6 Fix pickedchar not being set when it should have been 2023-10-31 04:04:01 -03:00
Krabs
cec5338f7c Merge branch 'lua-minmax-plus-bruh-moments' into 'next'
Fix bugs with preset values in lua cvars

See merge request STJr/SRB2!1484
2023-10-31 05:36:56 +00:00
Krabs
4e9915e1ba Merge branch SRB2:next into bind-multi-arg 2023-10-31 04:46:53 +00:00
Alam Ed Arias
419925036b Merge remote-tracking branch 'origin/next' into lua-minmax-plus-bruh-moments 2023-10-30 22:44:44 -04:00
Monster Iestyn
6976f8524d Merge branch 'expose-thrust-funcs-to-lua' into 'next'
Expose more thrust functions to Lua

See merge request STJr/SRB2!1493
2023-10-30 21:23:38 +00:00
Monster Iestyn
165a925220 Merge branch SRB2:next into expose-thrust-funcs-to-lua 2023-10-30 18:10:21 +00:00
Krabs
d6a0006b75 Merge branch 'combine-dupx-and-dupy' into 'next'
Combine vid.dupx and vid.dupy

See merge request STJr/SRB2!1118
2023-10-30 04:38:52 +00:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Krabs
d37a0a944d Merge branch 'blue-spring-balls' into 'next'
Blue spring balls

See merge request STJr/SRB2!1282
2023-10-30 04:37:00 +00:00
Logan Arias
2dcf845c7c Merge branch SRB2:next into blue-spring-balls 2023-10-29 18:23:50 +00:00
Krabs
f3c2fb50d7 Merge branch 'leaderofthechaotix' into 'next'
Possible fix for Leader of the Chaotix bug (credit Zwip Zwap Zapony)

Closes #1135

See merge request STJr/SRB2!2183
2023-10-29 17:43:40 +00:00
katsy
340d515754 Fix for "Leader of the Chaotix" name change bug (credit Zwip Zwap Zapony) 2023-10-29 17:43:40 +00:00
Monster Iestyn
512839453b Merge branch 'fix-opengl-saturation' into 'next'
Fix saturation not being applied on colormaps in OpenGL

Closes #920

See merge request STJr/SRB2!2151
2023-10-29 16:37:35 +00:00
Monster Iestyn
962b1cb29e Merge branch 'fix-opengl-saturation-console' into 'next'
Fix saturation not being applied on console on OpenGL

See merge request STJr/SRB2!2149
2023-10-29 16:37:24 +00:00
Monster Iestyn
e825a93add Merge branch 'nononet' into 'next'
Revert "Merge branch 'master' into next"

See merge request STJr/SRB2!2187
2023-10-29 16:19:16 +00:00
Alam Ed Arias
b4ba90b29d Merge branch 'master' into next 2023-10-29 08:47:28 -04:00
Alam Ed Arias
bea48012c4 Merge branch 'musl' into 'master'
Update .gitlab-ci.yml file

See merge request STJr/SRB2!2186
2023-10-29 05:16:34 +00:00
Alam Ed Arias
18f61ab90c Update .gitlab-ci.yml file
Add ARM64=1 for arm build
2023-10-29 05:14:48 +00:00
Alam Ed Arias
51c3dd3ff5 Merge branch 'master' into constants-global 2023-10-28 23:19:52 -04:00
Alam Ed Arias
97e449bd59 Merge branch 'master' into lua-minmax-plus-bruh-moments 2023-10-28 22:29:19 -04:00
Alam Ed Arias
0c49144c72 Merge branch 'master' into udmf-texture-scaling 2023-10-28 21:35:35 -04:00
Alam Ed Arias
bdc4512565 Merge branch 'master' into quake-fix 2023-10-28 21:02:44 -04:00
Alam Ed Arias
4398d3e104 Merge branch 'master' into ogl-wireframe 2023-10-28 20:43:08 -04:00
Alam Ed Arias
a2e288a4dc Merge branch 'master' into fix-segfault-removemobj-spawn 2023-10-28 20:40:07 -04:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
katsy
b658a9629e Revert "Merge branch 'master' into next"
This reverts commit b26cf5248f, reversing
changes made to a68440c4db.
2023-10-28 16:16:17 -05:00
Alam Ed Arias
c440788c92 Merge branch 'next' into menu-unresponsiveness-fix 2023-10-28 16:45:33 -04:00
Alam Ed Arias
b26cf5248f Merge branch 'master' into next 2023-10-28 16:42:54 -04:00
Alam Ed Arias
86d7c9862c Update .gitlab-ci.yml file
Now, try compiling with musl on Debian testing
2023-10-28 16:20:49 +00:00
Alam Ed Arias
f705e53826 GitLab CI: try compiling with dummy interface with musl 2023-10-28 11:49:26 -04:00
Gustaf Alhäll
e92787e75f
Fix Windows build 2023-10-28 15:44:45 +02:00
LJ Sonic
8608ded317 Add deprecation TODOs 2023-10-28 15:19:35 +02:00
LJ Sonic
c0146744b7 Normalise 2.3-related TODO comments 2023-10-28 14:46:10 +02:00
Gustaf Alhäll
e264caffe3
Fix dangling pointer in mapthing after removing mobj 2023-10-28 14:42:02 +02:00
LJ Sonic
c3f79a112f Add LUA_SetCFunctionField 2023-10-28 11:06:30 +02:00
LJ Sonic
d1dbdee016 Refactor global userdata registration 2023-10-28 00:24:04 +02:00
LJ Sonic
7a7d4f832a Remove stupid whitespace 2023-10-27 21:34:53 +02:00
LJ Sonic
bc9a378521 Refactor userdata metatable registration 2023-10-27 20:17:27 +02:00
LJ Sonic
4fa4d6e076 Implement input.ignoregameinputs 2023-10-27 17:34:29 +02:00
LJ Sonic
23268bf3e5 Move input-related Lua variables into the library 2023-10-27 16:29:47 +02:00
Gustaf Alhäll
b98d9dfe52
Use nanosleep for I_SleepDuration on *nix 2023-10-26 23:43:07 +02:00
Alam Ed Arias
6613886198 Update v_video.c
Killed `unused variable` warning
2023-10-26 18:36:43 +00:00
Alam Ed Arias
13055a1ae4 Update filesrch.c
Check if S_ISLNK is defined, if not, skip symlink code
2023-10-26 13:15:36 +00:00
Alam Ed Arias
b404c965a6 Update lua_hooklib.c
You need to "void" the functions
2023-10-26 09:47:50 +00:00
Alam Ed Arias
5693dcad44 Merge branch SRB2:next into loadfile 2023-10-25 19:50:55 +00:00
Alam Ed Arias
2b7e38726e Merge branch SRB2:next into bind-multi-arg 2023-10-25 19:50:36 +00:00
Alam Ed Arias
3ef47897e3 Merge branch SRB2:next into expose-thrust-funcs-to-lua 2023-10-25 19:42:15 +00:00
Alam Ed Arias
f5859c3480 Merge branch SRB2:next into blue-spring-balls 2023-10-25 19:41:36 +00:00