Sally Coolatta
9dd43d4e4e
Remove modeltilt, use roll & pitch instead
...
Broken currently, about half of the slopes you can go into have the wrong tilt
2020-10-28 18:36:26 -04:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Jaime Passos
cdc4a6d86e
Implement blend modes
2020-10-27 00:03:41 -03:00
Sally Coolatta
16e08d4388
Don't run P_RespawnBattleBoxes
2020-10-26 22:33:14 -04:00
Sally Coolatta
201f8365db
Merge branch 'battle-rethink' of https://git.do.srb2.org/KartKrew/Kart into battle-rethink
2020-10-26 22:20:25 -04:00
Sally Coolatta
62139f144a
Paper item spawners
...
Code is a little horrendous in a few places but I will hopefully fix later :V
2020-10-26 22:20:02 -04:00
James R
4570757c4e
Fix item respawn time underflow
2020-10-25 15:42:54 -07:00
Sally Coolatta
48d8bb242a
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-25 09:58:25 -04:00
Sally Coolatta
f121ed210a
Fix flashing tics
2020-10-25 09:57:51 -04:00
Sally Coolatta
5db7b337d9
Speed up sphere respawn
2020-10-24 21:45:35 -04:00
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
afbbfc9b1f
Fix cvars
...
My wrist burns...
2020-10-24 21:32:07 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
0969ca1af9
Karma bombs rework
...
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Sally Coolatta
7ce53ac104
Add blue spheres
...
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
2020-10-22 02:52:33 -04:00
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
