thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-10 10:02:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6155 commits 2 branches 14 tags 206 MiB
Commit graph

509 commits

Author SHA1 Message Date
mazmazz
ccffb0538d Merge branch 'control-selector' into text-prompts 2018-11-12 21:11:53 -05:00
mazmazz
69d0b76259 Fix PICSMETAPAGE 2018-11-11 14:50:10 -05:00
mazmazz
0ed806f281 Dehacked typos 2018-11-11 14:44:57 -05:00
mazmazz
b60335fd57 Merge branch 'tutorial-time' into tutorial-time-firstprompt 2018-11-11 09:21:10 -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
58c9232210 Implemented GFX for text prompts 
* PicMode SOC
* PicToLoop SOC
 2018-11-10 12:42:13 -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
e48156ed66 SOC for prompt gfx and music 2018-11-10 10:33:58 -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
b25cf9e0d9 Text prompt Hide HUD dehacked 2018-11-09 23:50:25 -05:00
mazmazz
2106ff30f0 Make gray/black text prompt backcolor darker in OpenGL 2018-11-09 22:52:13 -05:00
mazmazz
b7af1e385b Set up separate background color for prompts vs. console 2018-11-09 22:38:55 -05:00
mazmazz
6c785cff56 Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES 2018-11-09 21:55:14 -05:00
Monster Iestyn
1200793a94 Merge branch 'Playerquit_hook' into 'next' 
"PlayerQuit" Lua Hook

See merge request STJr/SRB2!127
 2018-11-08 15:53:35 -05:00
Monster Iestyn
5f7c333625 Merge branch 'lua-slopes' into 'next' 
Lua support for slopes

See merge request STJr/SRB2!307
 2018-11-08 15:52:44 -05:00
Monster Iestyn
b34e8c5390 Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00:00
GoldenTails
71f97a4a92 Add Lua Ultimate Mode global variable so people can use it. 2018-11-06 18:09:45 -06:00
mazmazz
039b7b17cf Support underscores -> spaces in TextPrompt name 2018-11-04 22:32:47 -05:00
mazmazz
568d87f254 Lowercase font for body text; added ICONFLIP parameter 2018-11-04 22:32:46 -05:00
mazmazz
3e8238f745 Implemented auto-advancing TextPrompts 
* Fixed TextSpeed
* New TimeToNext
* Other bugs
 2018-11-04 22:32:46 -05:00
Monster Iestyn
5a8e256ca1 Fix errors found when compiling 2018-11-04 22:32:46 -05:00
mazmazz
8d812ab24e Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling 2018-11-04 22:32:46 -05:00
mazmazz
28d5add0cf Kind of support line breaks with PAGETEXT. Can't trim trailing whitespace yet. 2018-11-04 22:31:52 -05:00
mazmazz
c1d6fcccf0 Broken attempt at supporting linebreaks for PageText, like cutscenes 2018-11-04 22:31:52 -05:00
mazmazz
f8f3795927 TextPrompt/Page freeslots; SOC Prompt/Page parsing 2018-11-04 22:31:52 -05:00
mazmazz
8f5f32a1b8 Trigger line exec by whether mobj is facing its tracer 
* MFE_TRACERANGLE
* Thing 758 MT_ANGLEMAN
* mobj thinker behavior
* Line Exec 457/458 Enable/Disable
 2018-11-04 16:28:25 -05:00
mazmazz
acbbe3daf8 Merge remote-tracking branch 'origin/master' into tutorial-time 2018-11-03 10:58:11 -04:00
Monster Iestyn
7cef400f0e Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens 2018-10-31 19:26:29 +00:00
Monster Iestyn
3895de5ab0 add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved 2018-10-21 16:27:54 +01:00
Monster Iestyn
7729abe5b9 Merge branch 'next' into lua-slopes 
# Conflicts:
#	src/lua_maplib.c
 2018-10-20 18:31:06 +01:00
Monster Iestyn
946cff8aed Whoops these should be L not gL here (not that it makes much difference normally though) 2018-10-11 21:44:25 +01:00
Digiku
a5a8282a77 Merge branch 'nights-score-lap' into 'master' 
NiGHTS: Intermission Bonuses

See merge request STJr/SRB2Internal!159
 2018-09-19 11:03:14 -04:00
Digiku
eb307a4066 Nights intermission dehacked: a comment 2018-09-19 10:45:51 -04:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz
a177548da6 Added NIGHTSLINK bonus type for the 2.1 Link Bonus 2018-09-09 01:13:02 -04:00
mazmazz
56d9522a62 Merge branch 'master' into nights-dronebox 2018-09-07 09:06:32 -04:00
mazmazz
2d86dddb00 Merge branch 'master' into flicky-things 2018-09-06 08:09:02 -04:00
Monster Iestyn
cc20eed183 Merge branch 'master' into tutorial-time 2018-09-04 15:54:50 +01:00
mazmazz
631a053e92 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
3c65251bb6 Merge branch 'master' into hud-cleaning 
# Conflicts:
#	src/y_inter.c
 2018-08-29 16:39:02 +01:00
Digiku
e5a1db2870 Merge branch 'intermission-bonuslivesmax' into 'master' 
Intermission: MaxBonusLives level header option for # of lives in score tally

See merge request STJr/SRB2Internal!162
 2018-08-29 04:25:03 -04:00
wolfy852
8134098558 Expose NEWTICRATE and NEWTICRATERATIO to Lua 
This should keep 70FPS-compatible scripts from throwing nil value errors.
 2018-08-25 03:40:43 -05:00
Monster Iestyn
f97ea7db39 Add INFLIVES as a constant that Lua/SOC can use 2018-08-23 22:18:52 +01:00
Monster Iestyn
785ba3abdd Merge branch 'master' into tutorial-time 2018-08-22 21:30:29 +01:00
Monster Iestyn
fa637475ae Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125 2018-08-22 17:16:11 +01:00
mazmazz
53303174c1 MaxBonusLives level header option for # of lives in score tally 2018-08-13 14:17:38 -04:00
mazmazz
1dab7b2f79 MT_IDEYAANCHOR info and spawn logic 2018-08-13 02:03:36 -04:00
mazmazz
8ec0865170 Have just one NiGHTS bonus option: NIGHTS and LINK together 2018-08-12 20:25:35 -04:00