stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-13 23:41:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
14266 commits 180 branches 42 tags 192 MiB
Commit graph

1465 commits

Author SHA1 Message Date
sphere
5dba53009e Merge branch 'recap-flip-spin' into 'next' 
Fix interpolation when curling up or scaling while flipped

Closes #983

See merge request STJr/SRB2!1979
 2023-08-20 17:16:53 +00:00
Zwip-Zwap Zapony
db59ec5998 Fix interpolation when curling up while flipped 
Also fix scaling interpolation while flipped, and fix the NiGHTS Drone flip interpolation on its first tic
 2023-08-17 17:39:24 +02:00
Zwip-Zwap Zapony
5830ff500f Fix mobj flag fumblings 2023-08-14 19:05:48 +02:00
Sal
492fe94597 Warp cheat adjustments 2023-08-07 18:35:20 +00:00
Sal
b7443cfa05 Merge branch 'lawofattraction' into 'next' 
Fix ring attraction and homing attack math errors (resolves #1045, #1001)

Closes #1001 and #1045

See merge request STJr/SRB2!2033
 2023-08-02 14:54:33 +00:00
Sally Coolatta
dc9346a45d Add forwardmove rng backwards compat with demos 2023-07-26 07:50:47 -04:00
Sally Coolatta
29f7ecd460 Remove P_RandomFixed call when players are moving 
"Add some extra randomization" is not how RNG works
 2023-07-26 07:46:51 -04:00
Zwip-Zwap Zapony
0e2682d590 Add "drawonlyforplayer" and "dontdrawforviewmobj" 2023-07-25 11:05:29 -04:00
Sal
1a209146d6 Merge branch 'spemblems' into 'next' 
Allow obtaining ring, time & grade emblems in regular gameplay

See merge request STJr/SRB2!1752
 2023-07-25 09:45:12 +00:00
Nev3r
022ddcf363 Merge branch 'models-plus-final' into 'next' 
3D models support for spritexoffset, spriteyoffset, spritexscale, spriteyscale, parity with sprite rollangle

See merge request STJr/SRB2!1840
 2023-07-24 12:46:10 +00:00
spherallic
86b4f93610 Allow obtaining ring, time & grade emblems in regular SP gameplay. 2023-07-24 08:34:10 -04:00
Sal
31d26c6f55 Merge branch 'awayview-fix' into 'next' 
Call P_ResetCamera Upon Switching To/From an Away View Camera

See merge request STJr/SRB2!2011
 2023-07-24 09:15:56 +00:00
Sally Coolatta
7c2a241042 Remove the need for setting rotation axis in spriteinfo for models 
Now it just does it like Software
 2023-07-24 04:40:15 -04: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
TehRealSalt
95cbee52c6 Model tilts 
- Add modeltilt variable, for more manual control of the model tilting. By default this just copies standingslope, but doesn't get cleared in the air.
- Shadows & trailing bananas now tilt to match the ground they are on.
- Rocket Sneakers & afterimages now tilt to match the player's current orientation.
 2023-07-24 04:11:42 -04:00
sphere
d7a84b967c Merge branch 'strongpower' into 'next' 
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately

See merge request STJr/SRB2!1366
 2023-07-05 17:05:47 +00:00
katsy
f261b9f0e1 Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately 2023-07-05 17:05:47 +00:00
katsy
2c66f2ce27 Fix homing attack and ring attraction math dumbs 2023-07-03 16:27:07 -05:00
Lach
bbe6c12323 Skincolor changes: 
- Tweaked Orange and Cobalt
- Added Pepper, Jade, Headlight, Master, Mauve, and Taffy
- Fixed Mario mode invincibility color cycle
(Opposite color shades are placeholder for now)
 2023-06-20 20:03:13 +02:00
SMS Alfredo
aa43aa7c8c Call P_ResetCamera Upon Switching To/From an Away View Camera 2023-06-03 15:43:58 -05:00
sphere
369d39a859 Merge branch 'stuckonyou' into 'next' 
Allow targeting invulnerable bosses & don't break targeting when they take damage

See merge request STJr/SRB2!1917
 2023-05-25 23:48:56 +00:00
sphere
38575f52e6 Merge branch 'scoreattacked' into 'next' 
Reallow score chains from rolling

See merge request STJr/SRB2!1833
 2023-05-25 22:48:31 +00:00
sphere
2df3fb53da Merge branch 'strong-lua-command-restrictions' into 'next' 
Fix up Lua command/cvar safety

See merge request STJr/SRB2!1943
 2023-04-12 17:50:01 +00:00
Gustaf Alhäll
4c02bde4e9
Fix crash during debug when escaping pterabyte 2023-04-10 18:31:12 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
James R
ff0f6e9b74 Add CV_ALLOWLUA to a bunch of cvars 
These cvars can be modified by Lua.

- advancemap
- allowexitlevel
- allowjoin
- allowmlook
- allowseenames
- allowteamchange
- autobalance
- basenumlaps
- cam2_adjust
- cam2_centertoggle
- cam2_curdist
- cam2_curheight
- cam2_dist
- cam2_height
- cam2_lockaimassist
- cam2_lockedinput
- cam2_orbit
- cam2_rotate
- cam2_rotspeed
- cam2_shiftfacingchar
- cam2_simpledist
- cam2_simpleheight
- cam2_speed
- cam2_still
- cam2_turnfacingability
- cam2_turnfacingchar
- cam2_turnfacinginput
- cam2_turnfacingspindash
- cam2_turnmultiplier
- cam_adjust
- cam_centertoggle
- cam_curdist
- cam_curheight
- cam_dist
- cam_height
- cam_lockaimassist
- cam_lockedinput
- cam_orbit
- cam_rotate
- cam_rotspeed
- cam_shiftfacingchar
- cam_simpledist
- cam_simpleheight
- cam_speed
- cam_still
- cam_turnfacingability
- cam_turnfacingchar
- cam_turnfacinginput
- cam_turnfacingspindash
- cam_turnmultiplier
- color
- color2
- competitionboxes
- cooplives
- coopstarposts
- countdowntime
- exitmove
- flagtime
- forceskin
- friendlyfire
- gravity
- hidetime
- inttime
- itemfinder
- killingdead
- matchboxes
- maxplayers
- mute
- numlaps
- overtime
- pausepermission
- playersforexit
- pointlimit
- powerstones
- respawndelay
- respawnitem
- respawnitemtime
- restrictskinchange
- ringslinger
- runscripts
- scrambleonchange
- seenames
- servername
- showhud
- showinputjoy
- skin
- skin2
- specialrings
- startinglives
- tailspickup
- teamscramble
- timelimit
- touchtag
- tv_1up
- tv_bombshield
- tv_eggman
- tv_forceshield
- tv_invincibility
- tv_jumpshield
- tv_recycler
- tv_ringshield
- tv_superring
- tv_supersneaker
- tv_teleporter
- tv_watershield
 2023-03-15 16:40:21 -07:00
Monster Iestyn
851ca92aaa revert Eidolon's edits for testing the IT/CTF flag sign fixes, they were left in by mistake 2023-02-28 17:51:26 +00:00
Eidolon
a308ad1119 Merge branch 'ctf-interpolation' into 'next' 
Fix IT and ctf flag sign interpolation

See merge request STJr/SRB2!1939
 2023-02-28 15:43:36 +00:00
Eidolon
c42ef9f1be Fix IT and ctf flag sign interpolation 2023-02-27 18:28:34 -06:00
sphere
1dfb8ed4c3 Merge branch 'issue912a' into 'next' 
Fixes Issue #912

Closes #912

See merge request STJr/SRB2!1909
 2023-02-27 20:37:38 +00:00
MascaraSnake
f94695390e Merge branch 'revert-gamepads' into 'next' 
Revert Gamepads for now

See merge request STJr/SRB2!1926
 2023-01-27 13:53:45 +00: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
Eidolon
add018cb83 Interpolate minecart marks 
Fixes STJr/SRB2#906

Uses the old displacement of the minecart to position the mark relative
to its destination. It's not completely correct, but it works.
 2023-01-25 21:09:50 -06:00
LJ Sonic
379cc4207a Revert "Merge branch 'netcode-refactor' into merging" 
This reverts merge request !1920
 2023-01-15 17:57:23 +00:00
LJ Sonic
41fb0c8943 Merge branch 'netcode-refactor' into merging 2023-01-15 17:45:06 +01:00
LJ Sonic
7c2fe20cd5 Move tic and net command handling to new files 2023-01-05 22:51:17 +01:00
katsy
3a04e11743 allow targeting invulnerable bosses 2023-01-05 14:11:54 -06:00
Arthur
449d27749f Fixes Issue #912 2022-12-31 20:30:39 -05:00
LJ Sonic
717e0d5a17 Move netcode files to a new folder 2022-12-31 14:10:19 +01:00
sphere
060b79452a Merge branch 'remove-spinning' into 'next' 
Remove PF_SPINNING upon use of any jump ability, so that directionchar works properly

See merge request STJr/SRB2!1429
 2022-12-31 09:39:06 +00: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
c582d73e4c Merge branch 'slowball' into 'next' 
Make CA_SLOWFALL Account for Scale

See merge request STJr/SRB2!1806
 2022-11-14 02:23:39 +00:00
Eidolon
c5527f9470 Merge branch 'pterabyte-tweaks' into 'next' 
Fix Pterabyte spawns (+ behavior tweaks)

See merge request STJr/SRB2!1839
 2022-11-13 23:40:56 +00: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
Alam Ed Arias
f5e1d9722f Merge branch 'master' into next 2022-11-11 22:03:58 -05:00
Alam Ed Arias
4e1976839b Cleanup whitespace changes from SRB2_release_2.1.25 2022-11-11 21:19:28 -05:00
Eidolon
12c2ddb115 Merge branch 'uncappedrevengeance' into next 
Uncapped

See merge request STJr/SRB2!1856

# Conflicts:
#	src/dummy/i_system.c
#	src/win32/win_sys.c
 2022-11-08 21:13:50 -06:00
spherallic
57cf1f870d Fix Pterabyte spawns, revert mashing requirement, increase grace period 2022-10-25 13:11:30 +02:00
katsy
2714ac44b4 reallow score chains from rolling 2022-10-12 20:38:29 -05:00
Eidolon
f43839ef8d uncapped: Reset cam interpolation on P_ResetCamera 2022-10-09 16:40:52 -05:00