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

939 commits

Author SHA1 Message Date
Nev3r
baeda5060c Basic multiple thinker list implementation 
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 22:39:22 +02:00
Nev3r
17edcd55e5 Things spawning over copied slopes now properly align on the new plane 
While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 19:03:50 +02:00
TehRealSalt
ea2bcb3b99 Update from master 2019-04-19 20:14:06 -04:00
TehRealSalt
a3d2b48329 Fix up more stuff 
Now in a mergable state
 2019-04-18 12:20:13 -04:00
Nev3r
dcb821ee33 Perform dynamic slope thinking before other thinkers. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-18 14:43:34 +02:00
TehRealSalt
089be795a2 Huge splitscreen refactor 
Did not get to finish all refactoring or even compile this, I'll continue later
 2019-04-18 03:08:11 -04:00
Nev3r
370e4eec6f Merge branch '144-scrolltweaks' into 'master' 
Resolve "Let scrollers and wind/current affect front sector if untagged, and use texture offsets as parameters if different from 0"

Closes #144

See merge request STJr/SRB2Internal!213
 2019-04-05 06:41:11 -04:00
Nev3r
bb374a7b36 Implement displacement-based polyobject rotation. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-05 11:50:59 +02:00
Monster Iestyn
11b5b624bb Whoops forgot this 2019-04-03 19:46:21 +01:00
Monster Iestyn
07e8ef6627 Split off part of P_SpawnSpecials into a new function called P_InitSpecials 
This allows tag lists, gravity, weather, and the "CheckFor" vars to be initialised before running P_LoadThings or P_ResetDynamicSlopes, in case they could affect mobj spawning or cause a netgame desync somehow by carrying over the previous level's values

# Conflicts:
#	src/p_spec.c
 2019-04-03 19:46:10 +01:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
Nev3r
e4870030d2 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks 2019-03-16 08:14:29 +01:00
mazmazz
2eb04ab17d Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
TehRealSalt
e3434cf724 Merge branch 'doubled-boost' into draft 2019-03-14 19:45:33 -04:00
mazmazz
06f4f355ff Fix custom fade source bug for Change Music linedef 2019-03-13 19:53:16 -04:00
Nev3r
281c7fa6b8 Override vectorial magnitude with front X offset, if provided; takes the line's lengths into account otherwise, as usual. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-03-13 12:24:47 +01:00
Nev3r
5b02ac70ff Dealt with no-tag business: 
* Wind/current pushers affect front sector if left untagged.
* Plane scrollers affect front sector if left untagged.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-03-13 11:13:54 +01:00
Latapostrophe
395df49ff0 Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works 2019-03-11 18:53:23 +01:00
TehRealSalt
0f4fd73533 Try out boost stacking 2019-03-11 12:00:39 -04:00
wolfy852
2dc5dde769 Merge remote-tracking branch 'remotes/origin/master' into waypoints 
# Conflicts:
#	src/k_kart.c
 2019-03-08 12:24:03 -06:00
Latapostrophe
2b47818d66 Fix respawning in reverse gravity 2019-02-18 14:00:36 +01:00
Sryder
a72630942d Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/p_mobj.c
 2019-02-01 17:29:17 +00:00
toaster
4e4d663b3e Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream. 
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
 2019-01-26 19:13:49 +00:00
TehRealSalt
3246ca6b33 More finished power level 
broken, can't finish
 2019-01-16 14:49:42 -05:00
TehRealSalt
3491a22a94 Add disable for music credit showing on the change music linedef 2019-01-09 21:17:10 -05:00
TehRealSalt
5be9f9e2d4 Add MUSICDEF lump for defining custom songs & replacing existing songs 
Very rudimentary at the moment, but it's workable
 2019-01-09 21:00:45 -05:00
TehRealSalt
09da50000e Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05:00
TehRealSalt
301477f212 Misc level init fixes 2019-01-08 20:14:58 -05:00
Monster Iestyn
69d7927ee8 resolve the conflict in p_spec.c 2019-01-07 17:02:05 +00:00
SeventhSentinel
74aba46823 In-game music credits 2019-01-04 04:44:55 -05:00
mazmazz
6086a9f238 Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core 2019-01-02 03:47:51 -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
SeventhSentinel
d9a3b37e30 Add a mapobjectscale global 
Should be no different than it was before, now it's just less tedious to type :V
 2018-12-12 21:55:59 -05:00
Sryder
9b00709966 Merge branch 'master' into waypoints 2018-12-04 22:29:22 +00:00
TehRealSalt
6a8913e192 Back to numstarposts/2 2018-12-02 02:29:47 -05:00
Sryder
746a004f18 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/info.c
#	src/p_mobj.c
#	src/p_spec.c
 2018-12-01 22:09:03 +00:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Sal
171e54d251 Merge branch 'mobjdamage-hook' into 'master' 
Lua "damage" hooks

See merge request KartKrew/Kart!115
 2018-11-29 07:16:22 -05:00
Latapostrophe
d240cfef86 Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s 2018-11-28 19:41:01 +01:00
toaster
2cf5350c0f LF_SECTIONRACE now has a secondary function! 
* Sets the player respawn coords on the finish line, so dying in the short interval between crossing an intermediate finish line and hitting a checkpoint doesn't send you all the way back to the beginning.
 2018-11-28 16:33:52 +00:00
Monster Iestyn
b4838e3afa remove redundant wadfile loop within wadfile loop for ANIMDEFS code 2018-11-27 23:05:33 +00:00
TehRealSalt
668efe9105 Require 3/5ths of checkpoints instead of 1/2 
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
 2018-11-27 14:28:11 -05:00
Latapostrophe
69b5efa71c Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players. 2018-11-26 21:23:41 +01:00
MonsterIestyn
d158d7e011 Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00: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
toaster
18c0d5d7bd Fix a bug where zoomtubes could cause ridiculous acceleration (ie, because PF_SPINNING was applied, causing ridiculously low friction, and then no mechanism was able to remove it) 2018-11-24 18:22:01 +00: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
48cf6572b3 Final touches 
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-24 09:26:52 +01:00