James R
d6ea8549d2
Scale end sign 1.5x
2021-02-13 21:38:22 -08:00
James R
a9a1779e19
Only disable 308 outside of Race
2021-02-13 20:10:12 -08:00
LJ Sonic
85cd429d1d
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 498ff708bb .
2021-02-13 17:45:20 +01:00
Sally Coolatta
1849f70359
Merge branch 'master' into waypoints-disable
2021-02-12 20:28:16 -05:00
Sally Coolatta
1f7fd96e32
Bot controller linedef
...
Controls bot behavior while they're touching a tagged sector.
X texture offset is angle to force the bot in (0 is east, 90 is north, 180 is west, 270 is south)
Y texture offset is trick type -- if a bot enters the sector while in trick panel state, then they'll do the input for the trick. Without the effect present, they'll do nothing and eventually tumble.
Y offset 1 does a left trick, 2 is right, 3 is forward, 4 is back/up.
2021-02-11 19:08:44 -05:00
James R
eabb97ea93
Line special 2003: No Climb - only respawn when crossing front side
2021-02-04 18:51:32 -08:00
James R
8c047372a6
Line special 2003: respawn player if crossing this line
2021-02-04 18:40:50 -08:00
Sally Coolatta
2a2198ade1
Remove MF_NOSECTOR from MT_WAYPOINT, so the linedef executor can search through sector thinglist for them.
2021-02-03 17:18:37 -05:00
Sally Coolatta
51a8d8d5cd
Not everything got commited...
2021-02-01 21:46:17 -05:00
Sally Coolatta
af2b525d31
Use linedef 499, make it actually work
2021-02-01 21:45:42 -05:00
Sally Coolatta
a84a19f247
Merge branch 'lap-executor-edit' into waypoints-disable
2021-02-01 18:17:56 -05:00
Sally Coolatta
07320723d8
Waypoint disable/enable executor
...
Not tested yet
2021-02-01 18:17:51 -05:00
Sally Coolatta
d627da7510
Fix lap executors not happening, and also edit it so they act like Each Time rather than Once
...
Allows for simplified executor logic on Desert Palace and Chrome Gadget, possibly Egg Zeppelin too
2021-02-01 14:34:48 -05:00
LJ Sonic
05a75758ab
Merge branch 'redundant-hypot' into 'next'
...
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's
See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
James R
802dd22de4
Sector Parameters Ripple
...
Upper Unpegged - Ripple on floor plane
Lower Unpegged - Ripple on ceiling plane
2021-01-12 22:33:49 -08:00
SteelT
29b5f38347
Merge branch 'master' into big-large-map-markers
...
# Conflicts:
# src/d_netcmd.c
2021-01-09 15:52:34 -05:00
Sally Coolatta
cfda66103d
Merge branch 'master' into just-tumble
2021-01-06 23:02:51 -05:00
Latapostrophe
fe4d9ce889
New trick panel shit (but only the gameplay part)
2021-01-06 21:20:28 +01:00
Latapostrophe
74a39837bb
Merge conflicts
2021-01-06 18:33:42 +01:00
James R
8b1c1a7ac2
Merge branch 'drain-antiri' into 'next'
...
Make Ring Drain sectors play the depletion sound instead of the ring sound
See merge request STJr/SRB2!1315
2020-12-15 20:51:39 -05:00
James R
b98d27a1ba
Merge branch 'circuit-finallap' into 'next'
...
Final lap text for circuit
See merge request STJr/SRB2!1303
2020-12-15 20:42:59 -05:00
James R
498ff708bb
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
Zippy_Zolton
7c1063ed86
Make Ring Drain sectors play the depletion sound instead of the ring sound
2020-12-11 12:34:30 -06:00
James R
9796b60cb0
Merge branch 'my-junk' into 'next'
...
Initialize dummy linedef tag lists
See merge request STJr/SRB2!1279
2020-12-10 15:29:10 -05:00
Zippy_Zolton
783c5490c2
CTF text 1
2020-12-08 15:56:45 -06:00
Zippy_Zolton
b8007b37f4
zwip suggestion
2020-12-08 12:05:06 -06:00
Zippy_Zolton
a198009fda
Final lap text for circuit
2020-12-07 16:46:05 -06:00
Tatsuru
e9a7d98522
Initialize in p_spec.c too + magic number replacement
2020-12-03 17:50:10 -03:00
James R
71553a8ad0
Merge branch 'battle-rethink' into 'master'
...
Battle rethink
See merge request KartKrew/Kart!335
2020-11-29 19:13:38 -05:00
toaster
f72108c4fa
A whole bunch of cleanup to get most record attack/replay stuff reasonably functional.
...
* Fix the screen being stuck black at the very start of start record attack.
* Bump up the demoversion to 7, because I want all previous v2 demos to be guaranteed kaput (it was previously 4, but 7 is a nice number).
* Fix a ton MORE shitcausing misalignments in the replay system, this time specifically focused on getting ghosts functional.
* Plug a few holes in the "best lap" record implementation that allowed for stupidly easy records due to the way v2's finish lines work.
* Make a few follower-related things sane, to prevent spurious console prints that were getting in the way of my test prints.
2020-11-27 20:30:28 +00:00
SMS Alfredo
f4c640394f
Allow the Forcespin sector type to be used with intangible fofs
...
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
2020-11-18 12:27:09 -06:00
SMS Alfredo
302ff8e43b
Allow forcespin sectors to work on no spin characters
2020-11-18 11:49:17 -06:00
Sally Coolatta
14b379fd27
Cherry-pick 4eb69a664
2020-11-16 19:52:26 -05:00
Nev3r
003f46c18e
Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing.
2020-11-12 13:48:14 +01:00
Sally Coolatta
56a20d05df
Merge branch 'master' into battle-rethink
2020-11-11 00:11:18 -05:00
Nev3r
38e17d556e
Forgot to change %d to %s for sizeu1().
2020-11-10 13:11:42 +01:00
Nev3r
f28a4077ba
Remove unused tag parameter.
2020-11-10 13:10:01 +01:00
Nev3r
7f14edf62e
Use sizeu1()
2020-11-10 12:34:08 +01:00
Nev3r
c22dbe1d2e
rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro.
2020-11-10 12:22:55 +01:00
Sally Coolatta
0e28470228
Merge master
2020-11-08 02:34:24 -05:00
Sally Coolatta
470e399abe
Merge master, add support for hitlag jitter in OpenGL
2020-11-08 01:56:27 -05:00
Sally Coolatta
91ed67bece
Start on Chaos Emeralds
...
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
James R
1db88decce
Put a run time warning that 415 doesn't work
2020-11-01 19:43:26 -08:00
James R
8f68a21f2f
Fix many instances of G_BuildMapName
...
Some things are gonna be busted. Fix it later, BYE.
2020-10-31 20:17:12 -07:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Sryder
11386e12ba
Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum
...
Should have easier merging and be less likely to break current effects.
2020-10-26 11:18:53 +00:00
Sryder
a585d3c9d1
Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps"
...
This reverts commit dc453fbbda .
2020-10-26 11:07:17 +00:00
Sryder
dc453fbbda
Fix various things that used NUMTRANSMAPS for the number of translucent trans maps
2020-10-25 23:19:20 +00:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
884eb3d515
Error icon for when a map is missing its signpost
2020-09-30 06:00:13 -04:00