Sally Coolatta
fa5fccffc5
Implement lives system
...
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
2020-05-13 02:14:39 -04:00
Sally Coolatta
63797b35f7
Merge branch 'pet-robo' into grand-pricks
2020-05-12 22:40:02 -04:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
MascaraSnake
4c526f6e50
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
f903ca960d
Not in modeattacking
2020-05-12 01:41:00 -04:00
Sally Coolatta
e2d95ae9c1
Fake results for bots that didn't get to finish in time
2020-05-09 23:08:11 -04:00
Sally Coolatta
4ae81ff236
Add menu for selecting cup & other options
2020-05-09 20:03:14 -04:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Sally Coolatta
4a3262da41
Initial GP commit
...
Has a rudimentary option in the menu, which spawns the specific bots & spawns you on Green Hills in singleplayer.
2020-05-09 03:42:51 -04:00
Sally Coolatta
d2172fc54b
Bot amount & difficulty is now controlled by cvars
2020-05-07 02:37:06 -04:00
James R
7c9824dc56
Multiply the default radius of 384 by mobjscale, but not user set radiuses
2020-05-04 17:54:43 -07:00
James R
e2d4ddcec2
SOC: DefaultWaypointRadius in the level header picardy
2020-05-04 17:39:11 -07:00
MascaraSnake
db717f1cf7
Move polyobject crush option to the first line args
2020-05-04 23:27:26 +02:00
MascaraSnake
af8bd89558
Adapt basic PolyObject setup to UDMF
2020-05-04 22:40:49 +02:00
MascaraSnake
8c22834b46
Merge branch 'next' into udmf-next
2020-05-04 20:32:56 +02:00
Latapostrophe
63485c3dbe
Merge branch 'v2-master' into followme-internal
2020-05-03 22:37:26 +02:00
MascaraSnake
5c0559a3d2
Adapt linedef executor delay to UDMF
2020-05-03 20:41:37 +02:00
MascaraSnake
1ed7c4eb46
Bugfix in XGL3 ZNODES parsing
2020-05-03 19:28:52 +02:00
MascaraSnake
2df5758ecf
Allow map-wide gravity to be set via level header
2020-05-03 18:33:18 +02:00
MascaraSnake
9abfcacc3c
Add level header options for setting special stage time and spheres requirements
2020-05-03 17:56:49 +02:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
Sally Cochenour
174a76f7e8
Merge branch 'master' into pet-robo
2020-04-28 21:10:16 -04:00
James R
4b2c13da0c
Merge remote-tracking branch 'origin/master' into fof-things-suck
2020-04-24 20:36:30 -07:00
MascaraSnake
d2e21afaf1
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
2020-04-24 21:15:53 +02:00
Monster Iestyn
f26e8f3df7
Merge branch 'thinker-cleanup' into 'next'
...
Plane movement thinker cleanup
See merge request STJr/SRB2!880
2020-04-24 14:30:52 -04:00
Monster Iestyn
20ec3f6c89
Merge branch 'emeraldspawnfix' into 'next'
...
Fix emerald hunt not working properly, part 2
See merge request STJr/SRB2!887
2020-04-23 15:41:27 -04:00
sphere
d5863b912f
Move variable declarations outside of for loops.
2020-04-22 23:17:18 +02:00
sphere
13c47b9e6f
Fix variable-length array definition, just in case.
2020-04-22 23:10:43 +02:00
sphere
b3b7ffb889
Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle.
2020-04-22 22:46:12 +02:00
sphere
d7185516f5
Fix a mistake with P_SpawnEmeraldHunt and make it more concise.
2020-04-22 20:38:58 +02:00
sphere
0868930d3b
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
Nev3r
3d6d767bce
Initialize pitch and roll on textmap mapthings too.
2020-04-22 09:00:29 +02:00
Nev3r
fbb2450133
Merge branch 'udmf-next' into udmf-thingargs
...
# Conflicts:
# src/p_setup.c
2020-04-22 08:58:40 +02:00
Ashnal
abc17c9448
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
Nev3r
3358413479
Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
...
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
See merge request STJr/SRB2!882
2020-04-21 12:27:26 -04:00
Louis-Antoine
74e8d7f733
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
2020-04-20 23:40:41 +02:00
Nev3r
5632120a74
Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike.
2020-04-19 15:18:36 +02:00
Nev3r
da165d2d22
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
MascaraSnake
c1dff185bf
Add enums to encapsulate the textmap colormap settings
2020-04-18 17:15:25 +02:00
MascaraSnake
7978920b53
Merge branch 'udmf-next' into udmf-argenums
2020-04-18 16:56:21 +02:00
MascaraSnake
6abc3da5de
Add enums to encapsulate the textmap slope settings
2020-04-18 16:55:56 +02:00
Nev3r
109d09aa4c
Merge branch 'udmf-colormaps' into 'udmf-next'
...
UDMF colormaps
See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
Sally Cochenour
96d69785bf
Merge branch 'master' into pet-robo
2020-04-18 01:18:22 -04:00
MascaraSnake
93eb0ee1c8
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
James R
0b3b13b3b5
Remove FOF height sorting
2020-04-15 19:16:49 -07:00
Nev3r
750cafbcbc
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-14 22:20:54 +02:00
Nev3r
44426fd453
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
2020-04-13 15:17:53 +02:00
Nev3r
1dae8df2f5
Merge branch 'udmf-next' into udmf-thingargs
2020-04-12 10:02:12 +02:00
Nev3r
860c44d953
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
