stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 13:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
15405 commits 173 branches 41 tags 184 MiB
Commit graph

240 commits

Author SHA1 Message Date
Zwip-Zwap Zapony
90958614f3 Shield button touchups 2024-02-24 15:41:36 +01:00
Logan Aerl Arias
2df90ec96b Merge branch SRB2:next into emblemexitfix 2024-02-12 05:09:04 +00:00
sphere
41613d89a1 Merge branch 'blockmap-links' into 'next' 
Make objects able to collide with others if they occupy multiple blockmap cells (resolves #592)

Closes #592

See merge request STJr/SRB2!2267
 2024-02-08 23:16:59 +00:00
Lactozilla
7cabf43e85 Merge branch 'lua-colorlib-get-sector-translation' into 'next' 
Add v.getSectorColormap and P_GetSectorLightLevelAt

See merge request STJr/SRB2!2230
 2024-01-21 23:54:08 +00:00
Lactozilla
756e9d0d48 Link objects into multiple blockmap sectors 
Ported from ZDoom
 2024-01-17 19:10:19 -03:00
Logan Aerl Arias
4edebbe67f Merge branch 'blockedexposed' into 'next' 
Expose P_LineIsBlocking to Lua

See merge request STJr/SRB2!2150
 2024-01-08 23:38:11 +00:00
Logan Aerl Arias
51bb5d41e0 Merge branch 'next' into lua-colorlib-get-sector-translation 2023-12-31 12:11:12 -05:00
Logan Aerl Arias
82f37ccadd Merge branch SRB2:next into emblemexitfix 2023-12-31 17:03:43 +00:00
Logan Aerl Arias
c159987a30 Merge branch SRB2:next into blockedexposed 2023-12-31 16:57:01 +00:00
SMS Alfredo
e680277428 Merge branch 'next' into 'setflip' 
# Conflicts:
#   src/p_local.h
 2023-12-29 03:30:15 +00:00
Logan Aerl Arias
64da1fada1 Merge branch 'handle-player-mobjsetstate' into 'next' 
Handle player state is P_SetMobjState

See merge request STJr/SRB2!2239
 2023-12-26 00:00:39 +00:00
Logan Aerl Arias
96e459c171 Merge branch 'optimize-mobj-allocations' into 'next' 
Cache and reuse removed mobjs when spawning mobjs

See merge request STJr/SRB2!2200
 2023-12-25 23:59:34 +00:00
Logan Aerl Arias
b5a4f227f6 Merge branch 'fix-segfault-removemobj-spawn' into 'next' 
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook

See merge request STJr/SRB2!1973
 2023-12-25 23:58:26 +00:00
Gustaf Alhäll
ddba6e80f7
Handle player state is P_MobjSetState 2023-12-23 13:45:16 +01:00
Lactozilla
eb3129490f Add P_GetSectorLightLevelAt 2023-11-30 19:50:22 -03:00
sphere
c7cae406b8 Merge branch 'lua-extracolormap' into 'next' 
Lua colorlib: extracolormap support

See merge request STJr/SRB2!2093
 2023-11-29 11:47:06 +00:00
SMS Alfredo
e50993861e Dedicated Shield / Super Transformation Button 2023-11-26 20:38:49 +00:00
Lactozilla
0a3f2ec4f8 Merge remote-tracking branch 'stjr/next' into lua-extracolormap 2023-11-23 13:38:31 -03:00
SMS Alfredo
c2c157603b Merge branch 'next' into 'setflip' 
# Conflicts:
#   src/p_local.h
 2023-11-06 00:47:51 +00:00
Gustaf Alhäll
4cf1d7fe10
Cache and reuse removed mobjs when spawning mobjs 2023-11-05 13:52:23 +01: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
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
e2a0d742ed Merge branch SRB2:next into expos-sky 2023-11-01 14:16:07 +00:00
Alam Ed Arias
a2e288a4dc Merge branch 'master' into fix-segfault-removemobj-spawn 2023-10-28 20:40:07 -04: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
15d476e3e6 Merge branch SRB2:next into expos-dust 2023-10-25 18:55:40 +00:00
Alam Ed Arias
b3ba4210d9 Merge branch SRB2:next into expos-sky 2023-10-25 18:55:00 +00:00
Alam Ed Arias
bc2f2b8d2a Merge branch SRB2:next into expos-follow 2023-10-25 18:34:25 +00:00
Alam Ed Arias
dea519637a Merge branch 'next' into lua-extracolormap 2023-10-23 14:49:44 -04:00
SMS Alfredo
7bcad024f8 Only Award Bonuses / RA Emblems from Physically Beating a Level 2023-09-19 21:48:01 -05:00
SMS Alfredo
ecf950e749 Add "allowflip" Parameter to P_DoJump 2023-09-19 11:54:51 -05:00
SMS Alfredo
a977fd6075 Expose P_LineIsBlocking 2023-09-17 18:45:57 -05:00
Lactozilla
3377fa986a Remember the player's color after a team gametype 2023-08-07 13:37:07 -03:00
Lactozilla
4ea2887d7f Lua colorlib: extracolormap support 2023-08-04 00:31:51 -03:00
Sally Coolatta
ae233b000f Remove modeltilt, use roll & pitch instead 
Broken currently, about half of the slopes you can go into have the wrong tilt
 2023-07-24 04:11:42 -04:00
Sally Coolatta
303d636f8e Individual emblems mode 2023-06-02 16:06:43 -04:00
SMS Alfredo
7a7cee7ca5 Expose P_CheckSkyHit to Lua 2023-05-31 23:03:22 -05:00
SMS Alfredo
34477133cc Expose P_DoSpinDashDust to Lua 2023-05-31 22:49:30 -05:00
SMS Alfredo
16e44e1b6e Expose FollowMobj-related functions 2023-05-31 22:28:53 -05:00
Gustaf Alhäll
4967c296ab
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook 2023-04-30 12:43:31 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
Eidolon
e5dea805fa Revert "Merge branch 'gamepad-refactor' into next" 
This reverts commit 696e2ab909, reversing
changes made to d98d59494f.
 2023-01-26 19:26:28 -06:00
Jaime Ita Passos
46f7fa406f Refactor gamepad code 
Implements the SDL Game Controller API, haptics, and axis bindings.
 2022-11-14 00:37:08 -03:00
Eidolon
9a88c9ea47 Merge branch 'gravityflipping' into 'next' 
Gravity flip bugfixes & additions

Closes #378, #661, and #430

See merge request STJr/SRB2!1808
 2022-11-12 23:33:07 +00:00
Eidolon
f43839ef8d uncapped: Reset cam interpolation on P_ResetCamera 2022-10-09 16:40:52 -05:00
spherallic
8d06145377 Play gravity flip sound on jump in jumpflip sectors, reorganize code 2022-09-09 15:35:05 +02:00
spherallic
9fabddd4bb Add sector type that flips gravity upon jumping 2022-09-08 16:56:35 +02:00
Eidolon
805941a98f Merge public next into uncappedrevengeance 
This is to capture the UDMF merges and make the later code review
easier.
 2022-05-03 14:45:14 -05:00