Sally Coolatta
afbbfc9b1f
Fix cvars
...
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
sphere
ab9c85f76a
Make record attack's quick retry more consistent.
2020-10-14 17:39:23 +02:00
sphere
a627c0b013
Only set MV_MP in multiplayer or a netgame.
2020-10-06 19:06:06 +02:00
sphere
be761714f6
Don't count demo playback as visiting a level.
2020-10-06 16:49:53 +02:00
Sally Coolatta
dc4acfca93
Use args[1] for Battle capsules speed
2020-09-27 06:36:40 -04:00
Sally Coolatta
a951521ebb
Use args for bot hints
2020-09-27 06:32:01 -04:00
Sally Coolatta
586bb71b4b
Move around the args
2020-09-27 05:58:36 -04:00
Sally Coolatta
728d4a9435
Fixes to Battle Mode capsules
2020-09-27 04:51:08 -04:00
Sally Coolatta
72672d68cf
UDMF support for waypoints
...
Changes:
- "waypoint ID" is now tag (previously angle)
- "next waypoint ID" is now angle (previously Z height)
- Z height is Z height
- Radius is controlled by args[0]
- "is finish line" is controlled by args[1]
- Waypoint parameters linedef, riser things, and anchor things will not do anything in UDMF mode
- Non-UDMF maps are unaffected
2020-09-27 03:58:41 -04:00
Sally Coolatta
c3e7e51d89
More proper method of setting mapobjectscale in non-UDMF maps
...
(I did the same change for UDMF too but it may be wrong; I don't have a test map for it though so I guess we'll see later)
2020-09-27 03:18:21 -04:00
Sally Coolatta
e1dcf80f8d
Fixed waypoints using bad Z height in non-UDMF maps
2020-09-27 02:48:03 -04:00
James R
3cad7398f0
Fix slope spawning; let polyobjects spawn again
...
Move P_SpawnMapThings before P_SpawnSpecialsThatRequireObjects.
Do not remove special from lines with ML_NETONLY or ML_NONET until after
slopes are spawned.
2020-09-25 13:35:56 -07:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
0d573b514e
Stupid polyobjects require things to be spawned >:(
2020-09-24 15:10:07 -07:00
James R
388d56a5f8
Search FOF target sectors for slope anchors
...
Requires spawning fake floors before slopes, and therefore before things,
basically before everything. Hopefully nothing breaks!
2020-09-24 01:56:38 -07:00
toaster
87c10047a5
A bunch of serious heavy lifting to fix title cards and closely related.
...
* Fix the title card fade's one-frame invalid memory read.
* Disable a redundant gamestate-activated wipe, which A) horribly broke Encore wipes, B) made normal map transitions take longer than they should, and C) held on the one glitchy title card wipe frame to make the game look more broken than it was.
* Fix Encore wipes being broken by the merge.
* Disable (not remove; may want to use later) the :nick: patch draw attempts from the title card drawer.
* Re-add zonettl support to the title card drawer.
* Move the title card drawer in front of the fade (Looks better for if we showcase 2.2 merge footage before creating a better title card).
2020-09-22 18:27:47 +01:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Sally Coolatta
54c487feff
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
James R
3f8edd38a5
Fix NOHW compiling
2020-08-24 18:06:00 -07:00
Sally Coolatta
3b8066a28e
Merge branch 'next' into discord-rpc-support
2020-08-23 05:32:32 -04:00
FlykeSpice
2d9ec1687c
Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
FlykeSpice
2424418390
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
Sally Coolatta
1d5251e1f1
Fix ZONE being all caps, standardize the function comments
2020-08-17 06:13:32 -04:00
Sally Coolatta
8fd64ca607
Fix ring usage & gravity
2020-08-16 02:12:17 -04:00
Sally Coolatta
0dc21106e5
Lua stuff is done
2020-08-15 07:47:18 -04:00
Sally Coolatta
9b9ab8a2d5
Get up to p_user
2020-08-14 23:23:14 -04:00
Sally Coolatta
5a98c00405
NOW we make it past p_mobj
2020-08-14 22:28:49 -04:00
Sally Coolatta
c665393bd0
actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V
2020-08-14 21:21:17 -04:00
Sally Coolatta
6ef0af4ba5
g_game and g_input now compile
2020-08-13 00:05:44 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
f8d1e75025
Merge remote-tracking branch 'public/next'
2020-08-12 18:50:41 -04:00
Sally Coolatta
135e9b9797
f_finale now compiles
2020-08-11 23:13:25 -04:00
Sally Coolatta
b9436ee015
More fixing up
...
Got tired again, but now it makes it to f_finale
2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843
Lots of splitscreen fixes
...
LOTS of stuff I changed to use arrays instead of constantly duplicated code
2020-08-10 23:38:32 -04:00
Sally Coolatta
c96bd5f64a
Many removals
...
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
2020-08-10 21:45:51 -04:00
Sally Coolatta
335deb80cd
Merge p_setup.c
2020-08-10 14:43:24 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
James R
f9e74e8ba2
Merge branch 'kill-cd-support' into 'next'
...
Kill CD support
See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
66d36d4fdf
Merge branch 'opengl-skydome-fixes' into 'next'
...
Move the sky dome code out of r_opengl.c, fix issues with shaders
See merge request STJr/SRB2!1071
2020-08-09 20:45:01 -04:00
Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
Sally Coolatta
337db54965
Missed this in p_setup.c
2020-08-06 17:55:36 -04:00
Sally Coolatta
b9886a166e
Merge p_setup.c
2020-08-06 11:42:16 -04:00
Sally Coolatta
c45a67c3f9
Pre start bulbs
2020-07-29 01:19:53 -04:00
Nev3r
3d90a6aebe
Merge branch 'udmf-next' into 'next'
...
Merge udmf-next into next
See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04:00
Sally Coolatta
b08459cbee
Buffer time before countdown depends on player count, no intro spin in 1v1
2020-07-27 23:31:46 -04:00
Sally Coolatta
679f3223b6
Remove silly white space
2020-07-25 21:07:27 -04:00
