thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-11 05:37:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4014 commits 2 branches 14 tags 206 MiB
Commit graph

4014 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias
df09b246ef Merge branch 'EOL-20' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:38:12 -05:00
Alam Ed Arias
c9c9aaa04a Merge branch 'EOL-19' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:35:31 -05:00
Alam Ed Arias
c91e0f9fd6 Merge branch 'EOL-15' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:01:29 -05:00
Alam Ed Arias
44e04bc6cd Merge branch 'EOL-14' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 21:52:54 -05:00
Alam Ed Arias
69fafaa21d Merge branch 'EOL-13' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 21:48:47 -05:00
Alam Ed Arias
bf83c1cd25 fix EOL on src/p_enemy.c 2018-11-27 21:25:07 -05:00
Alam Ed Arias
3ed9e0e373 fix EOL on src/p_enemy.c 2018-11-27 21:24:56 -05:00
Alam Ed Arias
3f55ce8e77 fix EOL on src/p_enemy.c 2018-11-27 21:18:29 -05:00
Alam Ed Arias
eeaaf66b04 fix EOL on src/p_enemy.c 2018-11-27 21:18:13 -05:00
Alam Ed Arias
0d053d9d1b fix EOL on src/p_enemy.c 2018-11-27 21:17:45 -05:00
Alam Ed Arias
cba6489fd7 Merge branch 'EOL-12' into EOL 2018-11-27 21:10:09 -05:00
Alam Ed Arias
92ff9929b2 fix EOL on src/p_enemy.c 2018-11-27 21:07:23 -05:00
Alam Ed Arias
457448501a Merge branch 'EOL-11' into EOL 2018-11-27 20:47:38 -05:00
Alam Ed Arias
c00cba17d0 fix EOL on src/p_enemy.c 2018-11-27 20:45:40 -05:00
Alam Ed Arias
13e4537dd7 Merge branch 'EOL-10' into EOL 2018-11-27 20:44:28 -05:00
Alam Ed Arias
351b3385d0 fix EOL on src/p_enemy.c 2018-11-27 20:41:27 -05:00
Alam Ed Arias
720cefbf69 Merge branch 'EOL-9' into EOL 2018-11-27 20:40:30 -05:00
Alam Ed Arias
f8aae10064 fix EOL on src/p_enemy.c 2018-11-27 20:38:59 -05:00
Alam Ed Arias
d89b38a05c Merge branch 'EOL-8' into EOL 2018-11-27 20:37:22 -05:00
Alam Ed Arias
b7eda67e07 fix EOL on src/p_enemy.c 2018-11-27 20:36:00 -05:00
Alam Ed Arias
6ef394aa1a Merge branch 'EOL-7' into EOL 2018-11-27 20:28:25 -05:00
Alam Ed Arias
1780ae7611 fix EOL on src/p_enemy.c 2018-11-27 20:26:42 -05:00
Alam Ed Arias
a8fc90c18a Merge branch 'EOL-6' into EOL 2018-11-27 20:25:29 -05:00
Alam Ed Arias
3f09f50f49 fix EOL on src/p_enemy.c 2018-11-27 20:24:05 -05:00
Alam Ed Arias
246193e81e Merge branch 'EOL-5' into EOL 2018-11-27 20:22:22 -05:00
Alam Ed Arias
96192a4f20 fix EOL on src/p_enemy.c 2018-11-27 20:19:50 -05:00
Alam Ed Arias
2d84877ce4 Merge branch 'EOL-4' into EOL 2018-11-27 20:17:52 -05:00
Alam Ed Arias
f5b5fb47f3 fix EOL on src/p_enemy.c 2018-11-27 20:12:53 -05:00
Alam Ed Arias
001b0eb6f3 Merge branch 'EOL-3' into EOL 2018-11-27 20:12:21 -05:00
Alam Ed Arias
9dfb32602c fix EOL on src/p_enemy.c 2018-11-27 20:08:23 -05:00
Alam Ed Arias
5270d1c535 Merge branch 'EOL-2' into EOL 2018-11-27 20:05:07 -05:00
Alam Ed Arias
634518d7d7 fix EOL on p_enemy.c 2018-11-27 17:21:18 -05:00
Alam Ed Arias
73d61e8858 fix EOL on p_enemy.c 2018-11-27 17:15:55 -05:00
mazmazz
200a5fccd0 Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1 2018-08-12 09:23:50 -04:00
mazmazz
e203edb450 Decouple Flicky Thing logic from spawnpoint variables; use mobj variables 2018-08-12 02:34:37 -04:00
mazmazz
b680dafdb4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things 2018-08-10 14:58:27 -04:00
Monster Iestyn
1952653f5b Merge branch 'public_next' 2018-08-10 19:36:51 +01:00
Monster Iestyn
877ac62895 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
Monster Iestyn
0001260b3a Merge branch 'woops!_all_trans' into 'master' 
Woops! All trans

See merge request STJr/SRB2!265
 2018-08-10 14:27:45 -04:00
Digiku
2f7cfcc7b8 Merge branch 'hardcoding-nights-spheredamage' into 'master' 
NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently

See merge request STJr/SRB2Internal!157
 2018-08-10 13:50:57 -04:00
Digiku
e1e00ecb88 Merge branch 'nights-invertloopfix' into 'master' 
NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2Internal!138
 2018-08-10 13:49:42 -04:00
mazmazz
9591ac92ec Pandora's Box support for player->spheres 
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
 2018-08-10 13:15:54 -04:00
MascaraSnake
72796d3d62 Merge branch 'hardcoding-time-again' into 'master' 
Hardcoding time again

See merge request STJr/SRB2Internal!130
 2018-08-10 13:14:53 -04:00
mazmazz
9e8784a376 SETSPHERES console command for debugging/cheating 
Fixed sphere spill bug where no spheres spill if player->rings is 0
 2018-08-10 13:06:53 -04:00
mazmazz
cf48944384 Make bigger default Flicky follow trigger from 128 radius to 320 radius 2018-08-10 04:24:14 -04:00
mazmazz
f8a3343500 Track player's previous mare rings with player->finishedrings. 
There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.
 2018-08-10 04:05:20 -04:00
mazmazz
7a8cdf06f4 Reset player->rings on denightserize and on new mare 2018-08-10 04:01:33 -04:00
mazmazz
37b50ca5a4 Tag damage fix error 2018-08-10 02:34:21 -04:00
mazmazz
674b9e918f Correct player->spheres deduction upon losing spheres 
player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.

Therefore, just deduct player->spheres.
 2018-08-10 02:18:34 -04:00
mazmazz
c2f81eaf8f MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation 2018-08-10 02:18:24 -04:00