TehRealSalt
c0ed28e828
why didn't this merge before??
2017-11-05 02:17:13 -05:00
TehRealSalt
d3387f816b
Battle Mode item respawning
2017-10-24 17:04:22 -04:00
TehRealSalt
31a13e245c
BATLLE MODE
...
AAAAAA
2017-10-22 03:06:35 -04:00
Wolfy
b27ab8f51b
oops
2017-10-11 21:14:14 -05:00
Wolfy
366fe9fa91
Add TD shadows to Kart
...
Disclaimer: I haven't tested this and therefore am not sure whether or not it actually works. I think it does. Probably.
2017-10-11 20:54:35 -05:00
Sryder
81fca118fe
Sort out conveyor and push stuff for new friction
2017-03-10 22:43:06 +00:00
Sryder
f00f74d69b
remove checkpointtimes and k_playerahead
...
they are basically unused outside of timeattack and checkpointtimes isn't sent for netplay anyway
we can reimplement later with a more sensible solution for lap times in time attack
2017-03-06 21:02:36 +00:00
Sryder
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
ZTsukei
580f909c6c
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 17:19:58 -05:00
Alam Ed Arias
765d68899f
Merge branch 'master' into next
2016-07-11 16:10:40 -04:00
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Alam Ed Arias
4d6a3e3398
FUNCMATH fun
2016-06-12 16:08:48 -04:00
toasterbabe
661da15146
Reinforcing encapsulation I originally broke down to allow for P_GetMobjGravity.
...
When I first wrote this, I thought the .h file that contained a function declaration needed to have the same name as the .c file the function was in. Now I know that's not the case, off to p_local.h with you.
2016-06-09 18:16:13 +01:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Monster Iestyn
e8a4d7b7b8
Fix replay camera not being turnable when climbing, sliding ...and several other things.
...
If in analog mode, this does not apply (also analog mode replay camera no longer borks)
2016-04-05 20:56:48 +01:00
ZTsukei
9d2e9e24c3
Fixing tabs
2016-02-15 20:39:08 -05:00
ZTsukei
69f9c10a99
16/02/15 Starting some setup
2016-02-15 11:08:54 -05:00
Inuyasha
1bdd4cf641
backport state-animations from internal master to public next
...
most other code in the branch did not come along for the ride.
2016-02-09 02:39:16 -08:00
Monster Iestyn
69550e98fe
Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit.
...
It helps make P_UpdateSpecials less messy-looking anyway.
2016-01-14 16:32:30 +00:00
Yukita Mayako
2fb03a7cff
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into angles
...
Conflicts:
src/p_map.c - Automatically resolved by mergetool
2015-08-22 09:52:11 -04:00
Monster Iestyn
fa935be129
Fixed the issue where diagonal springs couldn't teleport you to their centers anymore (guess whose fault that was! =D ). Basically I just made P_DoSpring boolean, which probably could be useful to Lua peeps as well. (it returns true if you were sprung, false if not)
2015-07-28 19:28:51 +01:00
Monster Iestyn
b88600dac6
tmfloorthing and tmhitthing are set to NULL at the start of P_MobjThinker, preventing any weird cases of carrying over the previous mobj's floor object or such.
...
This fixes the issue with upside-down springs shooting downwards if you touch another of its kind. Also fixes one of the issues with monitors in Icicle Falls (after you phase inside the East-most float-bob FOF's monitor via the other bug and jump up to break it while there, the NEXT monitor moves upwards too)
2015-05-31 13:57:27 +01:00
RedEnchilada
a9dba0ffd1
Condense GetFloor/CeilingZ into fewer functions, and use macros for the rest
2015-05-24 11:27:52 -05:00
RedEnchilada
3f8e7b1739
Revert/remove unused/broken junk from original slopes port
...
m_vector removal to come later. The little thing commented out in it
is so I could revert the weird tables.c change.
2015-05-22 20:57:58 -05:00
RedEnchilada
3d2b71b24c
Make cameras properly collide with slopes
2015-05-21 09:36:20 -05:00
RedEnchilada
d138f7e14f
Collision with FOF slopes (might be unfinished, idk)
2015-05-17 11:53:28 -05:00
RedEnchilada
1f0f6b64c1
Store the slope an object is resting on (if applicable)
2015-04-29 00:33:04 -05:00
RedEnchilada
776b5254e6
Slope collision fixes
2015-04-29 00:29:51 -05:00
RedEnchilada
58dd6d42af
Add P_GetFloorZ and P_GetCeilingZ as boilerplate to facilitate better slope collision
...
I have not used this anywhere in the code yet.
2015-04-27 13:18:12 -05:00
RedEnchilada
923fae476e
Merge branch 'fury-gh/slopes' into angles
...
Conflicts:
src/p_maputl.c
2015-04-19 15:56:55 -05:00
RedEnchilada
d2c74e1b13
Fix the west/south blockmap issue without fucking up huge maps
2015-04-08 21:32:07 -05:00
MonsterIestyn
34c396825f
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse)
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
Alam Ed Arias
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
Ronald Kinard
54f0d0c110
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-18 18:45:57 -06:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Alam Ed Arias
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
wolfy852
a8f5406233
Add P_Telekinesis and P_IsFlagAtBase to Lua.
2014-05-25 21:41:05 -05:00
Wolfy
f509c56e3c
Unstatic P_DoSpring.
2014-05-24 12:49:15 -04:00
Wolfy
3f1038dcbe
Unstatic P_SpawnSpinMobj.
2014-05-24 12:46:10 -04:00
Wolfy
ed82755b6d
Unstatic P_SpawnThokMobj.
2014-05-24 12:30:33 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
