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

306 commits

Author SHA1 Message Date
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
James R
619484259f Merge branch 'ceilingz' into 'next' 
Add P_CeilingzAtPos function

See merge request STJr/SRB2!1164
 2020-10-12 17:44:51 -04:00
James R
737ea51ace Merge remote-tracking branch 'origin/the-scary-22-merge' into sloped-camera 2020-10-04 16:32:19 -07:00
Snu
43b1894be3 Create P_CeilingzAtPos function 2020-09-30 07:56:57 +01:00
Sally Coolatta
285ec3e08c Player death uses damage types 
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
 2020-09-25 16:31:10 -04:00
Sally Coolatta
953afddd03 Fix camera not updating when F12ing, fixed camera not taking aiming into account, and minor cleanup 2020-09-25 09:28:19 -04:00
James R
f0c024e9bd Remove inverse slope option, merge quaketilt and slopeview into tilting cvar 2020-09-24 20:05:40 -07:00
James R
c5df256d9e Make fucking with the window optional 2020-09-24 16:49:34 -07:00
James R
176657fe54 Make rolling quake optional 2020-09-24 16:49:34 -07:00
James R
300d25116f Revise cvars, inverseslope is now the default 2020-09-24 16:49:33 -07:00
James R
a8fe25dd41 QUAAAAAAAAKE 2020-09-24 16:49:33 -07:00
James R
65d5fd0784 GONNAHURL HARDCODE 2020-09-24 16:49:33 -07:00
lachwright
e77ebf1234 Objectplace improvements: 
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
 2020-09-06 17:28:34 +09:30
Sally Coolatta
3e446a167c Restructure how damage works in kart COMPLETELY 
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
 2020-08-19 00:55:36 -04:00
Sally Coolatta
631f698432 Cleanup 
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.

I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
 2020-08-15 08:32:56 -04:00
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Sally Coolatta
5a98c00405 NOW we make it past p_mobj 2020-08-14 22:28:49 -04:00
Sally Coolatta
c665393bd0 actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V 2020-08-14 21:21:17 -04:00
Sally Coolatta
5a6263c36b Make it past p_mobj 2020-08-14 20:48:06 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes 
LOTS of stuff I changed to use arrays instead of constantly duplicated code
 2020-08-10 23:38:32 -04:00
Sally Coolatta
ecec1e8a8f OK the compiler still didn't like it, so just properly remove it entirely. 2020-08-10 17:22:55 -04:00
Sally Coolatta
65498a5c3a P_GetPlayerHeight is always player->mo->height 2020-08-10 17:15:02 -04:00
Sally Coolatta
cee33ab918 Merge p_local.h 2020-08-10 15:15:44 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
SteelT
ed91ca6244 Merge p_local.h 2020-08-08 17:57:45 -04:00
lachwright
c9d8fcc1cb Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
GoldenTails
80b42ba46e Expose P_MovePlayer to Lua. 2020-07-12 18:02:50 -05:00
lachwright
10b09f49c3 Add sightcheck boolean to P_RadiusAttack 
Also now destroys Egg Guard shields, and circumstantially Minuses
 2020-07-04 18:27:06 +08:00
lachwright
0a3b728e81 Knuckles changes: 
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
 2020-07-04 01:54:00 +08:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Louis-Antoine
d886e35576 Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
James R
89a2f8ec8d Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height 
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.

If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.

Set Ambush to raise the waypoint to the same z position.
 2020-04-04 01:20:38 -07:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/k_kart.c
 2020-03-21 23:27:55 +00:00
Louis-Antoine
4e7605f0e2 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Sally Cochenour
fa34e4eee4 Merge branch 'master' into sal-waypoints 2020-03-15 20:21:17 -04:00
lachwright
f0c98697dc Add camera pitching when driving on downhill slopes 2020-03-10 05:18:05 +08:00
Sally Cochenour
30d391b6b2 FINISH removing the shadows... 2020-03-01 17:35:49 -05:00
Sally Cochenour
c17f4dcf15 Remove our shadows 2020-03-01 17:07:52 -05:00
Sally Cochenour
48ff9ddf85 Move overtime stuff to k_battle.c 2020-03-01 15:58:00 -05:00
fickleheart
5aebc0ed6d Add JingleStatus hook for carrying custom jingle tunes 
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
 2020-02-23 17:20:44 -06:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
ba9f866acf Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
fickleheart
7bcb2ec0f6 Move spawnsnap to Special/ignore on sector trigger 
Also includes splitting the starpost logic into its own function.
 2020-01-24 23:54:54 -06:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
fickleheart
e0d09a457e Convert simple movement to directionchar+analog 
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
 2019-12-30 15:05:24 -06:00
fickleheart
f8599ffcb9 Save separate camera settings for standard/simple modes 2019-12-30 12:10:38 -06:00
fickleheart
be9384ddd9 Merge branch 'master' into newcontrols 
# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/g_game.h
#	src/m_menu.c
 2019-12-30 10:47:09 -06:00