thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5268 commits 1 branch 12 tags 205 MiB
Commit graph

5268 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
c91ac23ecb Merge branch 'musicplus-core' into musicplus-feature-postboss 2019-01-07 01:17:07 -05:00
mazmazz
e1a566157c Merge remote-tracking branch 'origin/master' into musicplus-core 2019-01-07 01:15:08 -05:00
mazmazz
403565e92f Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss 2019-01-07 01:10:54 -05:00
Nev3r
0d92c668d1 Fixed the shield spawn/special hook cases on the hook add switch. 
They basically work now.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-12-24 17:31:00 +01:00
Digiku
017ba468b8 Merge branch 'EOL' into 'master' 
fix EOL on src/p_enemy.c

See merge request STJr/SRB2Internal!208
 2018-12-24 01:33:03 -05:00
mazmazz
cb4b46f4f8 Remove inline from ST_drawWeaponSelect() to fix 32-bit compile 
large-function-growth limit reached
 2018-12-24 01:26:22 -05:00
Alam Ed Arias
dac1285e87 Merge remote-tracking branch 'private/master' into EOL 2018-11-27 23:36:09 -05:00
Alam Ed Arias
f76d9f24c9 Merge branch 'EOL-36' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:27:27 -05:00
Alam Ed Arias
d04bd9d88a Merge branch 'EOL-35' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:25:00 -05:00
Alam Ed Arias
da8990eccf Merge branch 'EOL-34' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:22:10 -05:00
Alam Ed Arias
ee8a8bd388 Merge branch 'EOL-33' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:20:14 -05:00
Alam Ed Arias
9c1e24f7a2 Merge branch 'EOL-32' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:18:14 -05:00
Alam Ed Arias
ab428421f0 Merge branch 'EOL-31' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:15:35 -05:00
Alam Ed Arias
d25e2c4167 Merge branch 'EOL-30' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:13:17 -05:00
Alam Ed Arias
0345c29d30 Merge branch 'EOL-29' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:10:14 -05:00
Alam Ed Arias
471ff27fe5 Merge branch 'EOL-28' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:08:58 -05:00
Alam Ed Arias
e45f7cc9f1 Merge branch 'EOL-27' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:59:33 -05:00
Alam Ed Arias
744607317e Merge branch 'EOL-26' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:56:43 -05:00
Alam Ed Arias
61042de7d2 Merge branch 'EOL-25' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:49:49 -05:00
Alam Ed Arias
2a036ee669 Merge branch 'EOL-24' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:47:28 -05:00
Alam Ed Arias
6e4f60aaa5 Merge branch 'EOL-23' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:45:24 -05:00
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
8dbde3dcd7 fix EOL on src/p_enemy.c 2018-11-27 21:32:15 -05:00
Alam Ed Arias
e991c30dd6 fix EOL on src/p_enemy.c 2018-11-27 21:32:03 -05:00
Alam Ed Arias
f644faa983 fix EOL on src/p_enemy.c 2018-11-27 21:31:54 -05:00
Alam Ed Arias
9c48c4c087 fix EOL on src/p_enemy.c 2018-11-27 21:31:46 -05:00
Alam Ed Arias
8b86139749 fix EOL on src/p_enemy.c 2018-11-27 21:31:26 -05:00
Alam Ed Arias
08eb1097ab fix EOL on src/p_enemy.c 2018-11-27 21:31:18 -05:00
Alam Ed Arias
a90d77a911 fix EOL on src/p_enemy.c 2018-11-27 21:31:09 -05:00
Alam Ed Arias
3cbfb16e40 fix EOL on src/p_enemy.c 2018-11-27 21:31:01 -05:00
Alam Ed Arias
04807bcfa5 fix EOL on src/p_enemy.c 2018-11-27 21:30:48 -05:00
Alam Ed Arias
4c1691361b fix EOL on src/p_enemy.c 2018-11-27 21:30:19 -05:00
Alam Ed Arias
3f45f51a45 fix EOL on src/p_enemy.c 2018-11-27 21:29:18 -05:00
Alam Ed Arias
2b91c2226c fix EOL on src/p_enemy.c 2018-11-27 21:27:17 -05:00
Alam Ed Arias
81ef92a198 fix EOL on src/p_enemy.c 2018-11-27 21:27:05 -05:00
Alam Ed Arias
3f252630c4 fix EOL on src/p_enemy.c 2018-11-27 21:26:48 -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