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
toasterbabe
e34ef54166 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_alignment_revamp 
# Conflicts:
#	src/info.c
#	src/p_mobj.c
 2016-11-20 19:21:10 +00:00
toasterbabe
85fb02aaf6 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 
# Conflicts:
#	src/p_inter.c
#	src/p_user.c
#	src/st_stuff.c
 2016-11-20 16:44:38 +00:00
toasterbabe
a2dabd7041 Fixed a bunch of things MI pointed out. 2016-10-31 14:03:53 +00:00
toasterbabe
2d50dd1fd1 A bunch of fixes that allow for proper handling of triggerspecial_touch. Not perfect, but I don't have any more time to spend tonight. 2016-10-31 00:02:38 +00:00
Monster Iestyn
304f4625e5 Merge branch 'master' into crumble-FOF 2016-10-29 17:06:34 +01:00
Monster Iestyn
82d29b59c1 Merge branch 'master' into damage-control 2016-10-29 17:05:59 +01:00
Monster Iestyn
39f837e56f Merge branch 'master' into lua-additions 2016-10-29 17:05:31 +01:00
toasterbabe
b9e7abe7ff Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-29 15:59:45 +01:00
Monster Iestyn
f4ddaf51ab Merge branch 'public_next' 2016-10-29 15:37:53 +01:00
Monster Iestyn
98e43ac0d9 Fixed ffloor_t Lua variables not actually saving to $$$.sav 
Stupid overlooked semicolons
 2016-10-25 16:15:17 +01:00
toasterbabe
76ff26e6fb Revert "Thorough jumpdamage setting." 
This reverts commit 8720252059.
 2016-10-23 15:53:12 +01:00
toasterbabe
c18c014bef Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-23 14:47:37 +01:00
toasterbabe
8720252059 Thorough jumpdamage setting. 2016-10-23 14:42:37 +01:00
Monster Iestyn
6473953c8c Merge branch 'master' into lua-additions 2016-10-22 14:59:01 +01:00
Monster Iestyn
1d70a9d9d2 Merge branch 'master' into crumble-FOF 2016-10-22 14:58:37 +01:00
Monster Iestyn
dd5fa80839 Merge branch 'master' into damage-control 2016-10-22 14:55:06 +01:00
Monster Iestyn
326ad8a14f Merge branch 'wallscrollbylinedef-fix' into 'master' 
Wallscrollbylinedef fix

See commit description.

See merge request !43
 2016-10-22 09:52:07 -04:00
Monster Iestyn
3bc29919c2 Merge branch 'public_next' 2016-10-20 16:38:39 +01:00
Yukita Mayako
aa3e52f05e Fix ANIMDEFS parsing to allow overwrite. 
ANIMATED and ANIMDEFS are now processed in reverse order,
and duplicate definitions in ANIMDEFS are dropped.
 2016-10-19 03:24:26 -04:00
Monster Iestyn
fc44e53056 Merge branch 'slopes-even-more-fixes' into 'next' 
Even more slope-related fixes

What it says on the tin pretty much:

Currently included fixes:
* Pusher specials applied to FOFs did not properly account for slopes applied to the bottom plane; this probably was just a minor slipup that appeared on adding the support in the first place, I take it? (some waterfall in the last section of SUGOI's Fudge Canyon is the only place I can think of offhand where this bug is noticable)

See merge request !114
 2016-10-18 17:19:13 -04:00
toasterbabe
ace44df8b4 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-16 01:32:05 +01:00
toasterbabe
aa8a454ea9 Turning some shield attributes into flags means that environmental protection and ring-pulling can be more elegantly handled. As a consequence, the S3 shields now have all their passives, and are just waiting on me to give them actives (two of which don't have the necessary sprites for...) 2016-10-16 01:23:00 +01:00
Monster Iestyn
8931a6f0fb Merge branch 'public_next' 2016-10-15 22:31:56 +01:00
Nevur
c558900c61 Deleted the Add_WallScroller function entirely from code. 
Removed commented out instance using the function.
 2016-10-07 18:56:10 +02:00
Monster Iestyn
0fb89c620d Merge branch 'master' into damage-control 2016-09-30 21:05:44 +01:00
Monster Iestyn
155882d2f1 Merge branch 'master' into crumble-FOF 2016-09-30 20:15:20 +01:00
Monster Iestyn
2f85704d87 Merge branch 'master' into lua-additions 2016-09-30 20:14:53 +01:00
toasterbabe
8f181abbb2 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_alignment_revamp 
# Conflicts:
#	src/p_mobj.c
#	src/p_spec.c
 2016-09-29 13:34:13 +01:00
toasterbabe
5f4f6fdac8 Public remake of a merge request I shouldn't have put in Internal in the first place. 2016-09-26 18:35:13 +01:00
toasterbabe
f933210c03 Let's simplify a lot of stuff. PF_CANCARRY instead of a horrible assortment of checks. 2016-09-24 13:18:08 +01:00
toasterbabe
1de32b3dac Fixed my mistake with static rope hangs. 
Also, the same smoothness changes have been ported over to zoom tubes!
 2016-09-24 00:37:18 +01:00
toasterbabe
e16648a72b Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. 
* PF_ITEMHANG -> CR_GENERIC
* PF_CARRIED -> CR_PLAYER
* (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE
* PF_ROPEHANG -> CR_ROPEHANG
* PF_MACESPIN -> CR_MACESPIN
 2016-09-23 23:48:48 +01:00
Monster Iestyn
9f87841936 Fix bottom of FOF with a pusher special not accounting for slopes 2016-09-08 22:55:11 +01:00
ZTsukei
82b0e9962e Toaster's friction code??? 2016-08-23 21:04:06 -04:00
ZTsukei
3a3180ce05 Redid control names, some item code, start of drift shenanigans 2016-08-20 22:15:11 -04:00
Monster Iestyn
df9ad4a0e6 wall-scroll-by-linedef specials now use just linedef dx/dy to determine scrolling direction, rather than the complex system that was in place before 
If there's any reason to bring the old system back we could make it togglable by one of the linedef flags I suppose. Not that many people would actually use it though, most likely
 2016-08-16 17:15:39 +01:00
ZTsukei
d631d0ef04 S_PLAY states, HUD stuff 2016-08-14 23:51:25 -04:00
toasterbabe
4ccb3b88d0 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_alignment_revamp 
# Conflicts:
#	src/p_mobj.c
 2016-08-10 00:10:18 +01:00
toasterbabe
aa93f8a25c Refactored the movefactor changes that made the player go Looney Tunes style on ice. 2016-08-10 00:05:46 +01:00
Alam Ed Arias
c3690092e1 Merge branch 'public_next' into master 2016-08-07 23:29:01 -04:00
RedEnchilada
02d3382408 Leave a note to anyone foolish enough to try to fix this 2016-08-07 12:17:31 -05:00
Monster Iestyn
6ac84687d3 Merge branch 'master' into lua-additions 2016-08-04 18:55:14 +01:00
Monster Iestyn
2b985bda85 Make sure we detect if start >= numlines so we can deal with that properly 
for some apparent reason the compiler didn't like the while loop condition edit on its own (it complained about inline failures for P_MobjReadyToTrigger for some reason), so I had to add that extra bit above the while loop... and it was happy again, huh
 2016-07-28 14:57:19 +01:00
Alam Ed Arias
59fd7bbe46 Merge branch 'public_next' (early part) into private 2016-07-11 15:50:06 -04:00
Monster Iestyn
3fba690d0a Allow $$$.sav to archive and read ffloor_t userdata Lua extvars 
Oh, and P_GetFFloorByID is now a thing, to assist with the above. Also added a suitable description for P_GetFFloorBySec
 2016-07-10 17:58:54 +01:00
toasterbabe
26f34d1038 Compiling fixes. 2016-07-09 17:36:24 +01:00
ZTsukei
e4a970f894 Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
Monster Iestyn
3b2ab4da1d added linedef type 446, for making FOFs remotely fall down 2016-06-21 22:04:58 +01:00
toasterbabe
7af14c20ed Everywhere in the code that was doing things wrong has been changed. 
Two interesting points of note:
* The touchspecial sector flag seems to actually do its job now.
* Detection of sectors with polyobjects in seems to have done this incorrectly, but this doesn't mess with anything about touching the polies themselves so it seems to really only handle edge cases where the polyobject was too close to the border of another sector (which would've likely made rendering glitches anyways).
* There was a whole swathe of teetering code that was basically never run properly because of this mistake. I did a simple fix at first, but you started teetering whenever you were slightly less than your radius away from a sector's edge, which was completely different and undesirable behaviour. Instead, I cut out the code that was never running, and just left the hacky method in instead since it was more accurate to what we want in general.
 2016-06-09 14:56:24 +01:00
toasterbabe
17e0adcbac Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. 
* m_snext ==> m_thinglist_next
* m_sprev ==> m_thinglist_prev
* m_tnext ==> m_sectorlist_next
* m_tprev ==> m_sectorlist_prev
 2016-06-09 14:16:02 +01:00