thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-07-07 15:06:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
22279 commits 2 branches 14 tags 207 MiB
Commit graph

22279 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
9604fe2e22 MUSICPOS console command 2018-08-15 01:52:35 -04:00
mazmazz
e2c40e63cf Lua PositionMusic switch to UINT32 2018-08-15 01:52:20 -04:00
mazmazz
ffa2bfcd22 Lua PositionMusic/GetPositionMusic and console TUNES position 2018-08-15 01:50:19 -04:00
mazmazz
ed83e09616 Lua funcs MidiPlaying/MusicPlaying 2018-08-15 01:44:11 -04:00
mazmazz
44c3928d82 Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:43:51 -04:00
mazmazz
d23d77754e Fix SDL music position getting; dummy out position methods for MIDI 
# Conflicts:
#	src/sdl/mixer_sound.c
#	src/sdl12/mixer_sound.c
 2018-08-15 01:42:15 -04:00
mazmazz
6d82e03710 SDL fix for I_SetSongPosition 
# Conflicts:
#	src/sdl12/mixer_sound.c
 2018-08-15 01:40:54 -04:00
mazmazz
55ef2d1d20 Change get/set music position to UINT32 parameter, milliseconds 
# Conflicts:
#	src/d_netcmd.c
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
 2018-08-15 01:40:20 -04:00
mazmazz
f8f71422ca Initial attempt for get/set song position 
* Declared I_SetSongPosition, I_GetSongPosition
* Implemented S_PositionMusic and S_GetPositionMusic
* Exposed in console TUNES and lua
* Implemented set position in SDL, SDL12, WIN32
* Implemented get position in WIN32

# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c
 2018-08-15 01:38:06 -04:00
mazmazz
6ec3aa337c Checkpoint: Force Egg Capsule time at 60 tics 2018-08-15 00:59:29 -04:00
mazmazz
fd725050d0 Attempt 1: Guesstimate sphere pop rate and use that as the Capsule handling duration 2018-08-15 00:32:48 -04:00
mazmazz
9371441008 Nights capsule faster attract timing 2018-08-14 19:48:18 -04:00
mazmazz
60df69d04c capsule->extravalue2 tic timer 2018-08-14 19:21:32 -04:00
mazmazz
af2fb1ef97 Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox 
# Conflicts:
#	src/p_inter.c
 2018-08-14 18:08:51 -04:00
mazmazz
9129f17ab0 Look for two anchorpoints if player has two Ideyas 
* Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
 2018-08-14 17:48:14 -04:00
mazmazz
0838a81dd9 Ideya fixes when a player has more than one Ideya 
# Conflicts:
#	src/p_inter.c

# Conflicts:
#	src/p_inter.c
 2018-08-14 17:28:51 -04:00
mazmazz
0a110d9ef4 Ideya fixes when a player has more than one Ideya 
# Conflicts:
#	src/p_inter.c
 2018-08-14 17:21:49 -04:00
toaster
c331432c46 Merge branch 'sonicitems' into encore 2018-08-14 22:17:11 +01:00
toaster
3e96e8417a Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-08-14 22:16:55 +01:00
toaster
2b56446cb9 Hide non-splitscreen number for natural quantities of orbinaut spikeball. 
Also, minor code tweaks.
 2018-08-14 22:16:33 +01:00
mazmazz
fe37d1e3e0 Ideya fixes when a player has more than one Ideya 2018-08-14 17:13:23 -04:00
mazmazz
a49aa9babe Fix bonus time quirk where lines are run if player->marebonuslap is 0 
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
 2018-08-14 16:08:21 -04:00
mazmazz
6ba6454056 Comments 2018-08-14 14:57:58 -04:00
mazmazz
d321ec83e1 Fix issue where player cannot destroy the NiGHTS Capsule if they have not transformed to NiGHTS 2018-08-14 14:18:18 -04:00
SeventhSentinel
e6021a1e8d Flashing diff change 2018-08-14 13:15:33 -04:00
mazmazz
9452c02ca1 Fix Capsule Entrance exec firing repeatedly 2018-08-14 12:48:00 -04:00
mazmazz
b1368078c6 Make Bonus Time Start executor into a general Egg Capsule Touch executor 
* Entrance/exit flags
* Enough/not-enough-rings flags (with "doesn't matter" line option)
 2018-08-14 12:00:37 -04:00
mazmazz
35bcf200be Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop 
* Use MT_EGGCAPSULE extravalue2 for tic timer
 2018-08-14 11:41:10 -04:00
mazmazz
3a3976bd71 Make LE Ring triggers accept spheres for NiGHTS levels 2018-08-14 11:10:10 -04:00
mazmazz
e399d08d76 Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres 2018-08-14 10:48:50 -04:00
toaster
bb3bb48fe6 * Disable inverting on encore level select pictures at unanimous request of last night's netgame. 
* Also, correct their alignment in y_inter.c.
 2018-08-14 15:32:17 +01:00
toaster
7b36e29cf9 Merge branch 'sonicitems' into encore 2018-08-14 15:25:38 +01:00
toaster
ef03450ef6 Odds and ends of bugfixing and polish. 
* Flashing Eggman-hit players.
* Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways.
* More complete playerarrow visuals for various items.
* Eggman fake (and debug) item get sounds.
 2018-08-14 15:23:38 +01:00
mazmazz
a2883009ed Preproc comment out Y_SetLinkBonus because unused 2018-08-14 10:20:56 -04:00
mazmazz
4f5ca26ce5 Attach fade_t thinker to proper control sector upon savegame load 2018-08-13 22:17:58 -04:00
mazmazz
b658598a96 Whitespace 2018-08-13 22:10:16 -04:00
toaster
09c1003d03 Merge branch 'sonicitems' into encore 2018-08-13 22:59:38 +01:00
SeventhSentinel
70958f91e5 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-08-13 17:46:54 -04:00
SeventhSentinel
7e79afd6da Use MF_NOCLIPTHING to avoid the 1 tic spawn discrepancy bug on held items 
I haven't been able to replicate the original bug myself, so I can't tell if it's truly fixed, but this doesn't seem to cause any other issues either.
 2018-08-13 17:46:51 -04:00
mazmazz
3255fcf26c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof 2018-08-13 14:47:57 -04:00
mazmazz
53303174c1 MaxBonusLives level header option for # of lives in score tally 2018-08-13 14:17:38 -04:00
mazmazz
2a2569155a Deduct marescore when player hits ground 
* ~~For speedrunning~~: Land on the Drone, keep your points!
 2018-08-13 11:12:53 -04:00
mazmazz
a177ac38f4 Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox 2018-08-13 09:51:14 -04:00
mazmazz
539c323838 Make Drone visual elements react to height change 2018-08-13 09:50:50 -04:00
toaster
797d03e8e4 Merge branch 'sonicitems' into encore 2018-08-13 14:22:52 +01:00
toaster
7b82345948 Fixed battle item respawning (caused by a stupid accidential assignment typo that was my fault). 2018-08-13 14:22:13 +01:00
mazmazz
3170d31708 Correct hitboxradius value; proper sparkle->z when moving x/y 2018-08-13 04:49:32 -04:00
mazmazz
f445d9d934 MT_IDEYAANCHOR: Use type 1714 instead of 1717 2018-08-13 03:18:23 -04:00
mazmazz
87fc89d110 Make anchoring non-specific to Ideya states (now anchor anything!) 
# Conflicts:
#	src/p_inter.c
 2018-08-13 02:19:53 -04:00
mazmazz
d3d837392f Ideya anchoring optimization 2018-08-13 02:17:29 -04:00