Commit graph

1900 commits

Author SHA1 Message Date
Jaime Passos
d348ff079b Only create floor sprite slopes when needed, instead of always allocating them.
Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
2020-10-14 13:07:02 -03:00
Jaime Passos
96fa912bae Implement object-defined floor sprite slopes. 2020-10-14 00:57:13 -03:00
Jaime Passos
a6f2e8b9c6 Implement relative and absolute sprite offsets for objects (mobjs)
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 12:57:36 -03:00
James R
4c7400b27e Merge branch 'save-netvars' into 'next'
Save netvars

See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
Jaime Passos
b4b4738c94 Changes to sprite rendering:
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
James R
e9d8166e3b Add CV_SAVE to netvars
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime

tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
2020-10-09 15:06:09 -07:00
Zippy_Zolton
25b0290e2e I am going to die :D 2020-10-09 15:42:55 -05:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Sally Coolatta
884eb3d515 Error icon for when a map is missing its signpost 2020-09-30 06:00:13 -04:00
Sally Coolatta
062ea7e430 Use scale 1 instead of 0 for player oblivion shrink 2020-09-27 10:36:44 -04:00
Sally Coolatta
dc4acfca93 Use args[1] for Battle capsules speed 2020-09-27 06:36:40 -04:00
Sally Coolatta
a951521ebb Use args for bot hints 2020-09-27 06:32:01 -04:00
Sally Coolatta
586bb71b4b Move around the args 2020-09-27 05:58:36 -04:00
Sally Coolatta
728d4a9435 Fixes to Battle Mode capsules 2020-09-27 04:51:08 -04:00
Sally Coolatta
72672d68cf UDMF support for waypoints
Changes:
- "waypoint ID" is now tag (previously angle)
- "next waypoint ID" is now angle (previously Z height)
- Z height is Z height
- Radius is controlled by args[0]
- "is finish line" is controlled by args[1]
- Waypoint parameters linedef, riser things, and anchor things will not do anything in UDMF mode
- Non-UDMF maps are unaffected
2020-09-27 03:58:41 -04:00
Sally Coolatta
c3e7e51d89 More proper method of setting mapobjectscale in non-UDMF maps
(I did the same change for UDMF too but it may be wrong; I don't have a test map for it though so I guess we'll see later)
2020-09-27 03:18:21 -04:00
James R
e0957b9250 Apply horizontal springs offset after mobj angle is set 2020-09-26 15:44:28 -07:00
Sally Coolatta
17b8a5d603 Shrink when dying post-finish
I started this in another commit and forgot to fully finish it. Also allows attacking bot-controlled players who won
2020-09-26 05:40:01 -04:00
Sally Coolatta
2f6962c103 Correct player angle when respawning from crushing 2020-09-26 03:12:22 -04:00
Sally Coolatta
9042f31dc3 Fix precipitation not working 2020-09-26 02:47:27 -04: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
f31923d2d6 Fix MFE_JUSTBOUNCEDWALL not getting removed 2020-09-25 13:30:03 -04:00
Sally Coolatta
91d4d19bda Fix a few instances of rainbow things going through invalid skincolors 2020-09-25 12:54:35 -04:00
Sally Coolatta
d960ae5599 Merge branch 'the-scary-22-merge' of https://git.do.srb2.org/KartKrew/Kart into the-scary-22-merge 2020-09-25 12:00:56 -04:00
Sally Coolatta
b5fcd74ef9 Merge master
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
toaster
e36da645d9 Revert a bruh moment from 2.2's development where, in order to fix statues and spikes from being visible on the death pit in CEZ, I made any object that comes into contact with a death pit and isn't on a whitelist delete itself.
(Now the Chao at the start of Sonic Speedway don't die immediately.)
2020-09-25 15:15:30 +01:00
Sally Coolatta
58d9ac899d Fixed friction being applied incorrectly
Kart's manual player friction adjustments were being called after movefactor was reset, meaning friction changed but movefactor was default, essentially creating old 2.1 friction again
2020-09-25 04:33:20 -04:00
Sally Coolatta
861cb8e144 Fix springs giving you way too many
(Also removed a bunch of instances of PF_SPINNING since we haven't used it)
2020-09-25 02:24:19 -04:00
toaster
f6158b7cf4 Fixed a crash I recieved while playtesting bots on Petref which was caused by an invalid subsector reference. This can only happen when the mobj was removed. I have no idea how or why this wasn't caught earlier, but I suspect we inherited this issue from upstream in the merger. 2020-09-23 12:49:42 +01:00
toaster
1ec6240001 Fix vwoops not properly clipping through stuff 2020-09-22 15:07:12 +01:00
toaster
a052501b01 Fix signpost front plate being fucked up (was broken by custom skincolours) 2020-09-22 13:41:48 +01:00
Sally Coolatta
99a1bacb81 Turning code overhaul
Packet drops are still broken, but at least netgames are playable now.
2020-09-22 00:35:44 -04:00
James R
0cddfdee74 Ignore slope anchors in P_SpawnMapThing 2020-09-21 19:35:49 -07:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
Tatsuru
5301255032 Ignore spectators 2020-09-19 23:10:03 -03:00
SteelT
d8bcc13fec Merge branch 'master' into trick-panels
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/k_kart.c
#	src/p_user.c
2020-09-18 00:54:45 -04: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
8e62efb79c Merge branch 'master' into next 2020-08-23 04:44:27 -04:00
FlykeSpice
2d9ec1687c Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
FlykeSpice
2424418390 Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
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
8ec67e1ff9 Fix mobjscale 2020-08-18 06:36:43 -04:00
Sally Coolatta
9863171879 Remove MF_BOUNCE, use MF_SLIDEME to enable P_SlideMove for an object 2020-08-16 03:03:04 -04:00
Sally Coolatta
e0e506ec55 Ran through a different compiler, fixing the minor warnings it had 2020-08-15 09:32:10 -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
Nev3r
e80e0b6007 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 2020-08-15 13:44:59 +02:00
Sally Coolatta
9efdc98de6 Makes it through all kart files
All that's left is SDL, OGL, maybe also Lua
2020-08-15 04:42:56 -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