stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-21 18:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
14665 commits 175 branches 42 tags 318 MiB
Commit graph

12989 commits

Author SHA1 Message Date
Lactozilla
badc122286 Merge branch 'next' into more-sprite2 2023-11-26 22:36:01 -03:00
Monster Iestyn
8e7d8281bd Merge branch 'master' into next 2023-11-26 20:44:52 +00:00
Monster Iestyn
47b3c25be6 Merge branch 'renderhitbox-nightsitems' into 'next' 
Group NiGHTS star/chip hitboxes with rings

See merge request
2023-11-26 20:41:38 +00:00
Monster Iestyn
4706e80df1 Merge branch 'superbutton' into 'next' 
Dedicated Shield / Super Transformation Button

See merge request
2023-11-26 20:38:49 +00:00
SMS Alfredo
e50993861e Dedicated Shield / Super Transformation Button 2023-11-26 20:38:49 +00:00
Monster Iestyn
5f98f7696e Merge branch 'botlessdumb' into 'next' 
Prevent Bots from using Tails' abilities when they don't have them

See merge request
2023-11-26 20:15:54 +00:00
Monster Iestyn
5fc9c1a65b Merge branch 'improve-file-search-perf-nix' into 'next' 
Improve file search performance on Linux and FreeBSD

See merge request
2023-11-26 20:12:09 +00:00
Monster Iestyn
10ca749991 Merge branch 'Termios_fix' into 'next' 
TERM IO fixup

Closes 

See merge request
2023-11-26 19:25:21 +00:00
Monster Iestyn
8d55cadbcf Merge branch 'kill-hud-feetoffset' into 'next' 
Fix offsetting of rotated sprites drawn in the HUD by Lua

See merge request
2023-11-26 19:23:13 +00:00
Monster Iestyn
5232540d02 Merge branch 'fix-lan-discovery' into 'next' 
Fix LAN discovery for SRB2 servers

See merge request
2023-11-26 00:21:40 +00:00
Monster Iestyn
9989cbe3e3 Merge branch 'fix-segfault-polyvertex-null' into 'next' 
Fix segfaults on some systems due to polyvertex being NULL

See merge request
2023-11-26 00:17:33 +00:00
Gustaf Alhäll
3c921044a3
Fix Windows build 2023-11-22 20:26:55 +01:00
Gustaf Alhäll
977cd0db24
Fix LAN discovery for SRB2 servers 2023-11-22 20:17:44 +01:00
Krabs
7962b243de Merge branch 'interpolate-captions' into 'next' 
Interpolate captions, Untie captions from resolution

See merge request
2023-11-14 04:47:50 +00:00
Krabs
e327b5fdf2 Merge branch 'quake-fix' into 'next' 
Implement epicenter and radius support for quakes.

See merge request
2023-11-14 04:22:45 +00:00
Krabs
177bdd6868 Merge branch 'platformpmomz' into 'next' 
Do not apply pmomz when jumping/bouncing through a platform

Closes 

See merge request
2023-11-14 04:02:39 +00:00
Lactozilla
f0bb1a4ab6 Add some comments 2023-11-13 14:08:08 -03:00
Lactozilla
a60c55e866 Refactor this code into P_ApplySuperFlagToSprite2 2023-11-13 13:24:18 -03:00
Lactozilla
7bc86509c5 Simplify this 2023-11-13 13:19:46 -03:00
Lactozilla
90ac57562f Skip sizeof(UINT16) bytes in the stream instead of sizeof(UINT8) 2023-11-13 13:09:25 -03:00
Lactozilla
1576f02d6c Add P_GetSuperSprite2 2023-11-13 12:19:03 -03:00
Lactozilla
ecabadba94 Add P_GetStateSprite2, P_GetSprite2StateFrame, P_IsStateSprite2Super to Lua 2023-11-13 12:13:44 -03:00
Lactozilla
962150c252 Add SPR2F_ enum to INT_CONST 2023-11-13 12:02:36 -03:00
Lactozilla
b3f9747533 Elaborate on what SPR2F_ means 2023-11-13 12:01:19 -03:00
Lactozilla
e503b6002c Turn XTRA_ into an enum 2023-11-13 11:52:33 -03:00
Lactozilla
0df7ded6be Fix typos 2023-11-13 11:52:12 -03:00
Lactozilla
5f5f8053fe Update sprite2 serialize 
Increase demo version
Fix code not using P_GetSkinSpritedef
Fix code not using correct data type for player sprite
 2023-11-13 11:46:55 -03:00
Lactozilla
0f0ee4d156 Fix P_GetStateSprite2 2023-11-12 22:52:17 -03:00
Lactozilla
7ed5e39b1f 'Fix' HWR_GetModelSprite2 2023-11-12 21:55:15 -03:00
Lactozilla
4408f4462e Add 'sprite2' field to states 2023-11-12 21:46:49 -03:00
Alam Ed Arias
2062553d22 Update i_system.c 
Add a check for overflowing the TERIOS buffer
 2023-11-09 20:21:04 -05:00
SMS Alfredo
7c986c6d29 Make sure bot has CA_FLY or CA2_SPINDASH for their behaviors 2023-11-09 17:01:27 -06:00
Krabs
55444cf204 Update version num (no, .14 isn't releasing yet) 2023-11-09 10:31:03 -05:00
Krabs
5fc7a5c2da Merge branch 'add-auto-kick-idle-players' into 'next' 
Add auto-kick for inactive players

See merge request
2023-11-04 16:34:46 +00:00
Krabs
7b1939c346 Merge branch 'lua-input-improvements' into 'next' 
A few Lua input improvements

See merge request
2023-11-04 16:02:09 +00:00
Gustaf Alhäll
5d18822142
Improve file search performance on Linux and FreeBSD 2023-11-04 14:21:17 +01:00
Alam Ed Arias
9b60fd824a Merge branch 'pickedchar-fix' into 'next' 
Fix  and 

Closes  and 

See merge request
2023-11-02 23:53:45 +00:00
Krabs
39ca3a0582 Merge branch SRB2:next into expos-sky 2023-11-01 17:26:59 +00:00
Krabs
7fd3c0612a Merge branch SRB2:next into expos-dust 2023-11-01 16:29:58 +00:00
Krabs
d1a6290a69 Merge branch SRB2:next into expos-follow 2023-11-01 16:10:49 +00:00
Krabs
c74163b313 Merge branch SRB2:next into expos-special 2023-11-01 15:34:09 +00:00
Krabs
8a1ebf2f7c Merge branch SRB2:next into expos-dust 2023-11-01 14:31:42 +00:00
Krabs
44c11cccbf Merge branch SRB2:next into expos-follow 2023-11-01 14:19:45 +00:00
Krabs
23b0f67900 Merge branch SRB2:next into expos-special 2023-11-01 14:18:25 +00:00
Krabs
e2a0d742ed Merge branch SRB2:next into expos-sky 2023-11-01 14:16:07 +00:00
Krabs
93c5b34ac0 Merge branch SRB2:next into expos-sphere 2023-11-01 14:14:16 +00:00
Lactozilla
e9637322f9 Simplify fix 
pickedchar doesn't need to be set in these two places, since G_DeferedInitNew already does that.
 2023-10-31 16:45:47 -03:00
Zwip-Zwap Zapony
8cf6e8252c Interpolate captions 2023-10-31 13:30:16 +01:00
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