SSNTails
d43d5fb9e1
Don't change drawangle while riding on a fan
2024-02-23 15:23:39 -05:00
SSNTails
34817d9776
Rollout rock handling with gravity boots
2024-02-18 22:38:34 -05:00
Logan Aerl Arias
b3c3a45a6c
Merge branch SRB2:next into fix-missing-mobjwasremoved-checks
2024-02-18 22:56:44 +00:00
Logan Aerl Arias
ae88c01f6e
Merge branch SRB2:next into nonightsever
2024-02-18 19:58:36 +00:00
Logan Aerl Arias
cf5520b275
Merge branch SRB2:next into instant-setscale
2024-02-17 03:25:41 +00:00
spherallic
b312377800
Clean up overzealous time check
2024-02-15 16:36:05 +01:00
spherallic
f4588d50b0
Merge branch 'next' into fruits-clipper
2024-02-13 19:14:26 +01:00
Logan Aerl Arias
2df90ec96b
Merge branch SRB2:next into emblemexitfix
2024-02-12 05:09:04 +00:00
Logan Aerl Arias
6d0fef8726
Merge branch SRB2:next into nonightsever
2024-02-12 04:53:51 +00:00
Gustaf Alhäll
1a53971c39
Fix various segfaults caused by missing P_MobjWasRemoved checks
2024-02-09 19:39:20 +01: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
spherallic
243fdd1a82
Merge branch 'next' into fruits-clipper
2024-02-04 22:43:48 +01:00
spherallic
8f2f70aeec
Merge branch 'next' into maretimers
2024-02-04 22:39:25 +01:00
sphere
5a00859baa
Merge branch 'bouncy-nights-fixes' into 'next'
...
General NiGHTS Fixes
See merge request STJr/SRB2!2199
2024-01-29 13:55:25 +00:00
Lactozilla
1d2ea9b046
Fix #1177
2024-01-17 20:02:50 -03:00
Lactozilla
756e9d0d48
Link objects into multiple blockmap sectors
...
Ported from ZDoom
2024-01-17 19:10:19 -03:00
Logan Aerl Arias
a3b79056e9
Merge branch 'translations' into 'next'
...
ZDoom translations
See merge request STJr/SRB2!2190
2024-01-17 03:24:54 +00:00
Lactozilla
0ffcf89c85
Merge branch 'next' into more-sprite2
2024-01-08 02:55:19 -03:00
Logan Aerl Arias
154af01348
Merge branch 'theyseemerollingtheybraking' into 'next'
...
Fix roll braking assuming player angle is camera angle (resolves #1055 )
Closes #1055
See merge request STJr/SRB2!2053
2024-01-08 03:13:57 +00:00
Zwip-Zwap Zapony
a4cb3960ce
Set old sprite scales and offsets for ghost mobjs
2024-01-03 14:04:40 +01:00
Zwip-Zwap Zapony
564d18b1ea
Add and use an "instant" parameter for P_SetScale
2024-01-03 14:04:40 +01:00
Logan Aerl Arias
3992e83e8f
Revert "Merge branch 'thokking-hell' into 'next'"
...
This reverts merge request !1551
2024-01-03 03:46:26 +00:00
Lactozilla
7fbd8f7025
Merge branch 'next' into more-sprite2
2024-01-02 22:09:17 -03:00
Lactozilla
b6e4771085
Merge branch 'next' into translations
2024-01-02 22:06:14 -03:00
Logan Aerl Arias
4dd2415262
Merge branch 'exitfix' into 'next'
...
Only Consider ExitLevel a Cheat When Used to Cheat
See merge request STJr/SRB2!2159
2024-01-02 03:05:24 +00:00
Logan Aerl Arias
474d112ae4
Merge branch 'setflip' into 'next'
...
Add "allowflip" Parameter to P_DoJump
See merge request STJr/SRB2!2158
2024-01-02 02:38:19 +00:00
Logan Aerl Arias
487b0d22ed
Merge branch 'next' into raise-skin-limit
2024-01-01 16:55:04 -05:00
katsy
b52836e5f1
Move player friction reset after movement code for lua qol
2024-01-01 03:10:09 +00:00
Logan Aerl Arias
a0bd81d09a
Merge branch SRB2:next into bouncy-nights-fixes
2023-12-31 17:07:22 +00:00
Logan Aerl Arias
057a3efe7f
Merge branch 'next' into fruits-clipper
2023-12-31 12:04:16 -05:00
Logan Aerl Arias
82f37ccadd
Merge branch SRB2:next into emblemexitfix
2023-12-31 17:03:43 +00:00
Logan Aerl Arias
8c3d590730
Merge branch SRB2:next into exitfix
2023-12-31 17:03:12 +00:00
Logan Aerl Arias
530c93c1e7
Merge branch SRB2:next into setflip
2023-12-31 17:02:58 +00:00
Logan Aerl Arias
987f6fbe2b
Merge branch SRB2:next into theyseemerollingtheybraking
2023-12-31 16:48:15 +00:00
Logan Aerl Arias
091a874514
Merge branch 'thokking-hell' into 'next'
...
New CA_THOK effect
See merge request STJr/SRB2!1551
2023-12-31 14:16:27 +00:00
Zwip-Zwap Zapony
c361b732db
General NiGHTS fixes
2023-12-29 16:04:03 +01:00
SMS Alfredo
e680277428
Merge branch 'next' into 'setflip'
...
# Conflicts:
# src/p_local.h
2023-12-29 03:30:15 +00:00
Lactozilla
70e9e2bdb0
Merge branch 'next' into more-sprite2
2023-12-27 23:48:20 -03: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
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
5f21befb09
Merge branch 'next' into translations
2023-11-30 18:54:36 -03:00
Lactozilla
0498c16cb6
Merge branch 'next' into raise-skin-limit
2023-11-26 23:08:13 -03:00
Lactozilla
badc122286
Merge branch 'next' into more-sprite2
2023-11-26 22:36:01 -03:00
SMS Alfredo
e50993861e
Dedicated Shield / Super Transformation Button
2023-11-26 20:38:49 +00:00
Lactozilla
a3e6b5e0fb
Merge remote-tracking branch 'stjr/next' into raise-skin-limit
2023-11-23 13:48:18 -03:00
Lactozilla
4408f4462e
Add 'sprite2' field to states
2023-11-12 21:46:49 -03:00
Lactozilla
879ac8dcd5
Merge remote-tracking branch 'stjr/next' into translations
2023-11-06 22:58:25 -03:00
SMS Alfredo
c2c157603b
Merge branch 'next' into 'setflip'
...
# Conflicts:
# src/p_local.h
2023-11-06 00:47:51 +00:00
Krabs
7b1939c346
Merge branch 'lua-input-improvements' into 'next'
...
A few Lua input improvements
See merge request STJr/SRB2!2185
2023-11-04 16:02:09 +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
Lactozilla
799bbe62ee
Copy translation in P_SpawnGhostMobj
2023-10-30 15:12:09 -03: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
LJ Sonic
8608ded317
Add deprecation TODOs
2023-10-28 15:19:35 +02:00
Alam Ed Arias
28e8ccbed7
Merge branch SRB2:next into nonightsever
2023-10-25 19:51:40 +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
d0cb7707e3
Merge branch SRB2:next into thokking-hell
2023-10-25 19:40:02 +00:00
Alam Ed Arias
15d476e3e6
Merge branch SRB2:next into expos-dust
2023-10-25 18:55:40 +00:00
Alam Ed Arias
bc2f2b8d2a
Merge branch SRB2:next into expos-follow
2023-10-25 18:34:25 +00:00
Alam Ed Arias
e5d16e7112
Merge branch SRB2:next into setflip
2023-10-25 18:05:24 +00:00
Alam Ed Arias
76a3cf6b4e
can not use max() on player->marbeguant
...
player->marebegunat is tic_t, which in unsigned.
Let just about INT32_MAX to see if it in - number space
2023-10-25 07:52:51 -04:00
Alam Ed Arias
1e1298b182
Merge branch SRB2:next into theyseemerollingtheybraking
2023-10-23 18:33:47 +00:00
Alam Ed Arias
7798d5964a
Merge branch SRB2:next into emblemexitfix
2023-10-23 18:27:34 +00:00
Alam Ed Arias
41dc39630e
Merge branch SRB2:next into exitfix
2023-10-23 18:26:53 +00:00
spherallic
9f2a6cde8a
NiGHTS text changes:
...
- Add lastmaretime to players, used to show time at mare/end results
- Replace textvar numbers with an enum (NTV_)
2023-09-28 22:22:29 +02:00
spherallic
8d14a08cdc
Replace capsule angle checks with arg1 checks
2023-09-23 15:21:44 +02:00
sphere
1c4419ee56
Merge branch 'fix-minecart-debug-build' into 'next'
...
Fix memory leak when other players are riding a minecart
See merge request STJr/SRB2!2146
2023-09-20 15:26:41 +00:00
SMS Alfredo
7bcad024f8
Only Award Bonuses / RA Emblems from Physically Beating a Level
2023-09-19 21:48:01 -05:00
SMS Alfredo
71b0f002c9
Only Consider ExitLevel a Cheat When Used to Cheat
2023-09-19 17:17:00 -05:00
SMS Alfredo
ecf950e749
Add "allowflip" Parameter to P_DoJump
2023-09-19 11:54:51 -05:00
LJ Sonic
2a896538d9
Merge branch 'netcode-rerefactor' into 'next'
...
Re-delete netcode
See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Gustaf Alhäll
65547ae036
Fix memory leak when other players are riding a minecart
2023-09-14 18:31:05 +02:00
Lactozilla
69df136e2b
Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color
2023-09-12 19:17:07 -03:00
spherallic
48a8043c1d
Allow per-mare timers in NiGHTS via level header
2023-09-06 14:19:23 +02:00
sphere
a90422a30e
Merge branch 'dodrawforviewmobj' into 'next'
...
Don't Copy mobj->dontdrawforviewmobj To MT_OVERLAYs
See merge request STJr/SRB2!2125
2023-09-05 17:56:34 +00:00
spherallic
52d356d09e
Don't attract bomb spheres with Nightopian Helper
2023-09-05 14:43:30 +02:00
Zwip-Zwap Zapony
2febb6ced9
Don't copy dontdrawforviewmobj to MT_OVERLAYs
2023-08-29 17:12:04 +02:00
Zwip-Zwap Zapony
7a1f952d9e
Make a comment clearer
2023-08-29 17:11:52 +02:00
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
Lactozilla
3377fa986a
Remember the player's color after a team gametype
2023-08-07 13:37:07 -03: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
LJ Sonic
0ade3ae0bc
Move tic and net command handling to new files
2023-07-27 15:38:45 +02:00
LJ Sonic
0b17e3c418
Move netcode files to a new folder
2023-07-27 15:38:42 +02: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
katsy
d844c06f9b
Fix roll braking assuming player angle is camera angle
2023-07-15 16:24:08 -05:00
