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
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
363541d16a Redundant type 1800 check for MT_COIN 2018-11-27 14:10:55 -05:00
mazmazz
55dae90eb7 Smarter pause/break rejection for setcontrol 2018-11-22 14:48:33 -05:00
Digiku
bc520b603a Merge branch 'new-control-names' into 'master' 
Change camera control names to Look

See merge request STJr/SRB2Internal!207
 2018-11-22 11:32:10 -05:00
mazmazz
e72df07c6c Change camera control names to Look 2018-11-22 11:28:32 -05:00
Digiku
b06482728d Merge branch 'nights-nerfjump' into 'master' 
Nights nerfjump

See merge request STJr/SRB2Internal!206
 2018-11-21 21:25:14 -05:00
mazmazz
2eb1b5186c Let skins jump their regular strength variances in NiGHTS 2018-11-21 21:24:44 -05:00
mazmazz
b1ddcb644e Nerf jumping 2018-11-21 21:13:15 -05:00
Digiku
7e48af8afd Merge branch 'nights-ideyaspawn-dronebox' into 'master' 
NiGHTS: Ideya Anchor Points

See merge request STJr/SRB2Internal!160
 2018-11-21 21:03:29 -05:00
mazmazz
06b8128013 Missed sign cast 2018-11-21 20:30:26 -05:00
Digiku
aed64a7c73 Merge branch 'nights-dronebox' into 'master' 
NiGHTS: Drone hitbox improvements and player position correction on Nightserize

See merge request STJr/SRB2Internal!158
 2018-11-21 20:19:39 -05:00
Digiku
24218532af Merge branch 'nov20-build-fixes' into 'master' 
Nov20 build fixes

See merge request STJr/SRB2Internal!205
 2018-11-21 17:23:20 -05:00
Digiku
989bdfb85e Merge branch 'debug_stuff' into 'master' 
Debug tweaks

See merge request STJr/SRB2Internal!144
 2018-11-21 16:41:51 -05:00
Digiku
5101d6ef36 Merge branch 'nights-fastercapsule' into 'master' 
NiGHTS: Faster Egg Capsule destruct sequence

See merge request STJr/SRB2Internal!164
 2018-11-21 16:30:01 -05:00
Digiku
180a6b3dc2 Merge branch 'nights-onfootcapsulefix' into 'master' 
NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS

See merge request STJr/SRB2Internal!185
 2018-11-21 16:29:37 -05:00
Digiku
4ecc1fcab7 Merge branch 'hud-n-menu-tidbits' into 'master' 
Improved addons menu performance and other HUD tidbits

See merge request STJr/SRB2Internal!151
 2018-11-21 16:29:24 -05:00
mazmazz
2d01a33da5 Don't accept KEY_PAUSE for control console command 2018-11-21 11:21:17 -05:00
mazmazz
72a32696a5 Dont show Hold to Retry HUD when using Pause/Break key 2018-11-21 11:10:18 -05:00
mazmazz
21a3121b95 Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-21 10:58:07 -05:00
mazmazz
3bb75690c4 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
Marco Z
c81857c8d8 Merge branch '5ec9ab373f5dccdc377527ecbc9d1a4f331f5d56' into nov20-build-fixes 
# Conflicts:
#	src/hardware/hw_main.c
 2018-11-20 22:42:20 -05:00
Marco Z
633c28b28a VC build fixes 2018-11-20 21:54:20 -05:00
mazmazz
2c3ed93178 build errors 2018-11-20 20:23:48 -05:00
Monster Iestyn
ec10b18c46 I forgot to do this earlier, welp 2018-11-20 21:17:46 +00:00
Monster Iestyn
eb4eef6104 Merge branch 'public_next' 
# Conflicts:
#	src/Makefile.cfg
#	src/d_clisrv.c
#	src/p_setup.c
#	src/r_segs.c
#	src/r_things.c
 2018-11-20 14:33:10 +00:00
Monster Iestyn
3cbe8b26b5 Merge branch 'master' into next 2018-11-20 13:55:36 +00:00
Monster Iestyn
22835af9e1 Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master' 
FOF wall rendering fixes and cleanup

See merge request STJr/SRB2!317
 2018-11-20 08:54:09 -05:00
Monster Iestyn
8da74cb193 Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs. 
...that was a mouthful
 2018-11-19 22:12:26 +00:00
Alam Ed Arias
1ff6cb01c7 Travis-CI: allow GCC 8.x to fail 2018-11-18 21:25:33 -05:00
Alam Ed Arias
674d31e808 Merge branch 'master' into Travis_CI-gcc8 2018-11-18 21:23:27 -05:00
Alam Ed Arias
6b3616aee6 Merge branch 'master' into next 2018-11-18 20:22:40 -05:00
Alam Ed Arias
dbf6884b37 We need to include the NUL char 2018-11-18 20:21:32 -05:00
Alam Ed Arias
913e6aeeb7 Merge remote-tracking branch 'public/master' into Travis_CI-gcc8 2018-11-18 19:59:21 -05:00