stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 02:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
5057 commits 171 branches 41 tags 310 MiB
Commit graph

5057 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nev3r
caaacf3f76 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
47a810decb 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
e708f750a0 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
7bd0900fad Merge remote-tracking branch 'private/master' into EOL 2018-11-27 23:36:09 -05:00
Alam Ed Arias
d7fb5b1b8c Merge branch 'EOL-36' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:27:27 -05:00
Alam Ed Arias
4bd2781055 Merge branch 'EOL-35' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:25:00 -05:00
Alam Ed Arias
7924c5c41b Merge branch 'EOL-34' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:22:10 -05:00
Alam Ed Arias
27dcac7c7c Merge branch 'EOL-33' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:20:14 -05:00
Alam Ed Arias
64f67b0871 Merge branch 'EOL-32' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:18:14 -05:00
Alam Ed Arias
b28c3b106a Merge branch 'EOL-31' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:15:35 -05:00
Alam Ed Arias
5557609978 Merge branch 'EOL-30' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:13:17 -05:00
Alam Ed Arias
eca4f2cbce Merge branch 'EOL-29' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:10:14 -05:00
Alam Ed Arias
87f9cef564 Merge branch 'EOL-28' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 23:08:58 -05:00
Alam Ed Arias
af859bc337 Merge branch 'EOL-27' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:59:33 -05:00
Alam Ed Arias
1a6e69742f Merge branch 'EOL-26' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:56:43 -05:00
Alam Ed Arias
b09e4ed32d Merge branch 'EOL-25' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:49:49 -05:00
Alam Ed Arias
385aa633d7 Merge branch 'EOL-24' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:47:28 -05:00
Alam Ed Arias
ab27fc29a2 Merge branch 'EOL-23' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:45:24 -05:00
Alam Ed Arias
1b9b667404 Merge branch 'EOL-20' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:38:12 -05:00
Alam Ed Arias
c2d1c4207b Merge branch 'EOL-19' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:35:31 -05:00
Alam Ed Arias
18c2de0003 Merge branch 'EOL-15' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 22:01:29 -05:00
Alam Ed Arias
47bb524aff Merge branch 'EOL-14' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 21:52:54 -05:00
Alam Ed Arias
a9f04a68e1 Merge branch 'EOL-13' into EOL 
# Conflicts:
#	src/p_enemy.c
 2018-11-27 21:48:47 -05:00
Alam Ed Arias
e39e689aeb fix EOL on src/p_enemy.c 2018-11-27 21:32:15 -05:00
Alam Ed Arias
f57ec03ad5 fix EOL on src/p_enemy.c 2018-11-27 21:32:03 -05:00
Alam Ed Arias
da180ec2da fix EOL on src/p_enemy.c 2018-11-27 21:31:54 -05:00
Alam Ed Arias
ae536bb978 fix EOL on src/p_enemy.c 2018-11-27 21:31:46 -05:00
Alam Ed Arias
5d54fb7ec5 fix EOL on src/p_enemy.c 2018-11-27 21:31:26 -05:00
Alam Ed Arias
a6c2154936 fix EOL on src/p_enemy.c 2018-11-27 21:31:18 -05:00
Alam Ed Arias
92576787a7 fix EOL on src/p_enemy.c 2018-11-27 21:31:09 -05:00
Alam Ed Arias
5092995eb4 fix EOL on src/p_enemy.c 2018-11-27 21:31:01 -05:00
Alam Ed Arias
024818168a fix EOL on src/p_enemy.c 2018-11-27 21:30:48 -05:00
Alam Ed Arias
342b7e9106 fix EOL on src/p_enemy.c 2018-11-27 21:30:19 -05:00
Alam Ed Arias
b0228fea33 fix EOL on src/p_enemy.c 2018-11-27 21:29:18 -05:00
Alam Ed Arias
2a97b46ecc fix EOL on src/p_enemy.c 2018-11-27 21:27:17 -05:00
Alam Ed Arias
ebfd2dd421 fix EOL on src/p_enemy.c 2018-11-27 21:27:05 -05:00
Alam Ed Arias
3f6df31735 fix EOL on src/p_enemy.c 2018-11-27 21:26:48 -05:00
Alam Ed Arias
7cc688944a fix EOL on src/p_enemy.c 2018-11-27 21:25:07 -05:00
Alam Ed Arias
8f93a5c06f fix EOL on src/p_enemy.c 2018-11-27 21:24:56 -05:00
Alam Ed Arias
74afcd4e8e fix EOL on src/p_enemy.c 2018-11-27 21:18:29 -05:00
Alam Ed Arias
638b70fb0c fix EOL on src/p_enemy.c 2018-11-27 21:18:13 -05:00
Alam Ed Arias
fb72955780 fix EOL on src/p_enemy.c 2018-11-27 21:17:45 -05:00
Alam Ed Arias
c43b200221 Merge branch 'EOL-12' into EOL 2018-11-27 21:10:09 -05:00
Alam Ed Arias
5b77b35eea fix EOL on src/p_enemy.c 2018-11-27 21:07:23 -05:00
Alam Ed Arias
0765c83ccc Merge branch 'EOL-11' into EOL 2018-11-27 20:47:38 -05:00
Alam Ed Arias
04e42e1d56 fix EOL on src/p_enemy.c 2018-11-27 20:45:40 -05:00
Alam Ed Arias
0646e96c77 Merge branch 'EOL-10' into EOL 2018-11-27 20:44:28 -05:00
Alam Ed Arias
b09940fdda fix EOL on src/p_enemy.c 2018-11-27 20:41:27 -05:00
Alam Ed Arias
247388c6f7 Merge branch 'EOL-9' into EOL 2018-11-27 20:40:30 -05:00
Alam Ed Arias
05d5d1f254 fix EOL on src/p_enemy.c 2018-11-27 20:38:59 -05:00