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

141 commits

Author SHA1 Message Date
Monster Iestyn
6827688575 Merge branch 'public_next' 2019-04-02 15:49:15 +01:00
Monster Iestyn
4f58d00eec Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
Monster Iestyn
257f31c1ba Merge branch 'public_next' 
# Conflicts:
#	src/doomstat.h
#	src/g_game.c
 2019-03-28 14:19:02 +00:00
James R
d7ad7a4f40 Remove redundant CON_ClearHUD calls 2019-03-26 12:59:13 -07:00
Monster Iestyn
7ef12f7dd7 Merge branch 'master' into next 2019-03-26 13:46:15 +00:00
Monster Iestyn
9da1033467 Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way 2019-03-25 21:35:04 +00:00
mazmazz
2eb04ab17d Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
mazmazz
937a423664 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
Monster Iestyn
974e3aa4f2 Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/m_menu.h
 2019-02-27 22:36:01 +00:00
mazmazz
4f40d2abdb Merge errors for compile 2019-01-07 17:05:20 -05:00
Digiku
8e862b3c98 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
Digiku
e45c54dc60 Update f_finale.c - Remove Torgo's real name by request 2019-01-07 03:41:25 -05:00
mazmazz
81352aece1 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
4e07436276 Credits update 2018-12-23 14:41:41 -05:00
mazmazz
a03acf16b4 Add SRB2 Community Contributors to Special Thanks 2018-12-22 23:41:43 -05:00
mazmazz
8e40bdb59d Re-order Special Thanks -- groups first, then names in ABC order 2018-12-21 11:40:35 -05:00
mazmazz
a4ddad6824 Add sirjuddington and CodeImp to Special Thanks credits 2018-12-20 17:27:25 -05:00
Monster Iestyn
94ad0b880f Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00:00
Wolfy
cabe9871e3 Multiple admins 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
 2018-11-29 06:46:59 -06:00
Monster Iestyn
d824e05a6f Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
Digiku
f79adecdef Merge branch '21-source-copyright' into 'master' 
Update source copyrights to 2018

See merge request STJr/SRB2!346
 2018-11-25 07:36:41 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Digiku
bacdb3a392 Merge branch '21-credits-update' into 'master' 
Extra credits update .21

See merge request STJr/SRB2!345
 2018-11-25 07:21:31 -05:00
mazmazz
354037b251 Additional 2.1 credits update 2018-11-23 21:57:07 -05:00
Monster Iestyn
4db1220ad9 Merge branch 'master' into next 2018-11-23 21:01:03 +00:00
Digiku
032d6a02fe Merge branch '21-credits-update' into 'master' 
2.1.21 credits update

See merge request STJr/SRB2!339
 2018-11-23 07:38:28 -05:00
mazmazz
f51d2950a5 Update credits for 2.1.21 2018-11-23 07:34:23 -05:00
mazmazz
d1209e3f3d Make the credits pics darker 2018-11-22 20:08:02 -05:00
mazmazz
3bb75690c4 Merge remote-tracking branch 'origin/master' into HEAD 2018-11-20 23:19:36 -05:00
mazmazz
336610c042 Remove misplaced tutorialmode = false due to debugging 2018-11-13 14:12:22 -05:00
mazmazz
7b0ec6479f Merge branch 'master' into text-prompts 2018-11-13 11:12:44 -05:00
mazmazz
7b224cdcd5 Tutorial named tag detection adjustment 2018-11-13 02:00:58 -05:00
mazmazz
5270743a42 F_AdvanceToNextPage adjustment 2018-11-13 01:38:20 -05:00
mazmazz
422692ed03 NextTag implementation 
* Adjust named tag implementation to be more portable
* Next page adjustments
 2018-11-13 00:13:36 -05:00
mazmazz
deb036058c text-prompts gclist -> gcl refactor 2018-11-12 23:31:10 -05:00
mazmazz
7663c0828e PicToStart implementation; fix NumPrompts limitation error 2018-11-12 23:16:24 -05:00
mazmazz
b68fb6ec4e F_GetTextPromptTutorialTag implementation 2018-11-12 22:47:20 -05:00
mazmazz
8b434072a9 Stub netgame support; ignore bots on linedef special 2018-11-10 15:34:56 -05:00
mazmazz
4f2f5c7e6d Let triggering splitscreen player control the text prompt 2018-11-10 14:47:30 -05:00
mazmazz
9c8a3818ef Splitscreen "support" (one prompt only, both players freeze controls) 2018-11-10 14:30:59 -05:00
Monster Iestyn
4c3bfe81bd Merge branch 'public_next' 
# Conflicts:
#	src/Makefile
#	src/doomtype.h
#	src/hardware/hw_clip.c
#	src/hardware/hw_main.c
#	src/sdl12/sdl_sound.c
 2018-11-10 19:18:34 +00:00
Monster Iestyn
f3d129e1a6 Merge branch 'master' into next 2018-11-10 19:05:33 +00:00
mazmazz
b45fe054cb Pictoloop zero-based fix 2018-11-10 12:54:59 -05:00
mazmazz
58c9232210 Implemented GFX for text prompts 
* PicMode SOC
* PicToLoop SOC
 2018-11-10 12:42:13 -05:00
mazmazz
c607991f16 Implement music switching for prompts 2018-11-10 11:05:33 -05:00
mazmazz
b1bfc35ad7 Hardcode tutorial prompt offset index 2018-11-10 10:15:16 -05:00
mazmazz
9660c0e3c8 Prompt page string field length adjustment; check empty named tag before prompt search 2018-11-10 09:38:32 -05:00
mazmazz
3174969755 Added page tags and find page by tag 
* Added tutorial mode defines to this branch
 2018-11-10 09:32:53 -05:00
mazmazz
bf9b5c5d5b Prompt HUD hiding implementation 2018-11-10 01:00:18 -05:00