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
8607 commits 1 branch 12 tags 205 MiB
Commit graph

379 commits

Author SHA1 Message Date
Wolfy
cabe9871e3 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00
Monster Iestyn
a6a4b74692 Merge branch '21-controls' into 'next' 
Default control changes for 2.1.21

See merge request STJr/SRB2!343
 2018-11-27 11:50:42 -05:00
Alam Ed Arias
fc5e97dba9 Merge branch 'master' into next 2018-11-26 19:49:19 -05:00
MonsterIestyn
d158d7e011 Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
mazmazz
e6be735a08 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
Monster Iestyn
d824e05a6f Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Nev3r
34c472dfb7 Merge branch 'PK3-Backport' into 'PK3-BackportNext' 
Pk3 backport

See merge request Nev3r/SRB2!1
 2018-11-24 06:02:19 -05:00
Nev3r
623c7097f1 Backported PK3 support to 2.1 
Hopefully I'm not missing anything.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 16:58:16 +01:00
mazmazz
823b75797e Add chasefreelook to separate third and first person mouselook 2018-11-22 17:05:24 -05:00
mazmazz
3bb75690c4 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05: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
Alam Ed Arias
aef0d9a421 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
MonsterIestyn
44646db6af Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
mazmazz
5cb72f7071 tutorial-time gclist -> gcl refactor 2018-11-12 23:25:49 -05:00
mazmazz
14199fd516 First time tutorial prompt fixes 2018-11-12 19:10:41 -05:00
mazmazz
8b1624576f Merge branch 'tutorial-time' into tutorial-time-firstprompt 2018-11-12 18:08:48 -05:00
mazmazz
eb5f05848c Also set cv_analog for tutorialgcs 
* M_TutorialSaveControlResponse CV_Set adjustment
 2018-11-12 17:34:56 -05:00
mazmazz
dfb395ab37 Change mouse cv vars temporarily alongside control scheme 2018-11-12 17:30:21 -05:00
mazmazz
5944411c26 Restrict control changes if tutorialgcs is active 2018-11-12 16:56:06 -05:00
mazmazz
b60335fd57 Merge branch 'tutorial-time' into tutorial-time-firstprompt 2018-11-11 09:21:10 -05:00
mazmazz
6d6776a4d8 Merge branch 'control-selector' into tutorial-time 2018-11-11 08:46:06 -05:00
mazmazz
86168a1d80 Tutorial mode support for control switching 2018-11-11 08:20:08 -05:00
mazmazz
88e52640ad Merge branch 'control-selector' into tutorial-time 2018-11-10 17:30:33 -05:00
Monster Iestyn
7989e9a482 Merge branch 'public_next' 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/g_game.h
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_hudlib.c
#	src/lua_libs.h
#	src/lua_maplib.c
#	src/lua_script.c
#	src/m_misc.h
#	src/p_mobj.c
#	src/s_sound.c
#	src/sdl12/mixer_sound.c
#	src/w_wad.c
 2018-11-10 15:41:57 +00:00
mazmazz
59417ecd4a WIP: First-time tutorial prompt 2018-11-10 02:30:21 -05:00
Monster Iestyn
32a2c6dc3c Merge branch 'master' into next 2018-11-09 16:09:49 +00:00
mazmazz
acbbe3daf8 Merge remote-tracking branch 'origin/master' into tutorial-time 2018-11-03 10:58:11 -04:00
LJSonik
3a8ee79cb1 Merge branch 'master' into analog-flipcam-synch-fix 2018-10-29 19:52:08 +01:00
Louis-Antoine
2dc6a102bb Fix desynch when toggling analog mode or flipcam 
Special thanks to Lat' for asking weird questions
 2018-10-29 00:49:23 +01:00
Monster Iestyn
a0c822fec8 Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/m_menu.c
#	src/s_sound.c
#	src/sdl/sdl_sound.c
 2018-10-20 15:31:48 +01:00
Monster Iestyn
a44b368ee0 Merge branch 'master' into next 2018-10-20 14:13:13 +01:00
Steel Titanium
9b8b5ea57c Move commands and console variable into s_sound.c 2018-10-11 16:29:43 -04:00
mazmazz
c64d52c1f9 Don't call I_StartupSound in SFX toggle 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
 2018-09-14 16:39:10 -04:00
mazmazz
1ca6ac1c67 Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method 
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering

(cherry picked from commit 701cc5a7dd1dfead87a42ec7558c9fa6a1deb193)
 2018-09-14 10:23:37 -04:00
Monster Iestyn
dbff92ea30 Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works 2018-09-04 16:58:49 +01:00
Monster Iestyn
82e46d101c Merge branch 'public_next' 
# Conflicts:
#	src/r_main.c
 2018-09-04 15:53:07 +01:00
Monster Iestyn
6774933263 Merge branch 'addfile-verify-fix' into 'next' 
Addfile command verify fix.

See merge request STJr/SRB2!272
 2018-09-03 17:17:46 -04:00
Steel Titanium
277bec55c2 Only do this if the admin player isn't the server host also. 2018-08-30 18:32:26 -04:00
Monster Iestyn
d60ade9f95 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +01:00
Digiku
3c43ce46c6 Merge branch 'sphere-ring-concurrence' into 'master' 
Change SETSPHERES console command to SETRINGS to handle player->spheres transparently

See merge request STJr/SRB2Internal!167
 2018-08-29 04:24:23 -04:00
Monster Iestyn
6c85af79f6 Merge branch 'master' into hud-n-menu-tidbits 
# Conflicts:
#	src/m_menu.c
#	src/screen.c
#	src/st_stuff.c
 2018-08-28 20:51:46 +01:00
Latapostrophe
da3fb0913b Changed chat position, 
Added chat back tint
Fixed word wrapping glitches
 2018-08-19 10:58:29 +02:00
mazmazz
4b8fd01bc0 Revert "SETSPHERES console command for debugging/cheating" 
This reverts commit 9e8784a376.
 2018-08-16 11:34:57 -04:00
mazmazz
ef49700a49 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop 2018-08-10 15:04:14 -04:00
Monster Iestyn
1952653f5b Merge branch 'public_next' 2018-08-10 19:36:51 +01: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
Monster Iestyn
9812df00d6 Merge branch 'master' into next 2018-08-06 15:15:35 +01:00
Monster Iestyn
ed6f6e3a75 Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server! 2018-08-05 20:17:30 +01:00
Monster Iestyn
502c80eaac Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00