incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17971 commits 1 branch 0 tags 204 MiB
Commit graph

1812 commits

Author SHA1 Message Date
James R
20e0d99ea0 Remove trailing whitespace 2020-12-12 02:40:46 -08:00
Jaime Ita Passos
0d81a70397 Fix ERZ3 mode 2020-12-10 21:55:22 -03:00
James R
8cc312a16d Merge branch 'saloondoor-revengeance' into 'next' 
Saloon door fixes (closes #394)

Closes #394

See merge request STJr/SRB2!1296
 2020-12-10 15:43:31 -05:00
James R
10fd3606ce Merge branch 'firemelt' into 'next' 
Fix objects with MF_FIRE disappearing in lava (Closes #366)

Closes #366

See merge request STJr/SRB2!1287
 2020-12-10 15:37:57 -05:00
James R
ff6eecb64d Merge branch 'metal-sigfpe' into 'next' 
Fix a division by zero in BCZ2 Metal Sonic's routine

See merge request STJr/SRB2!1283
 2020-12-10 15:35:03 -05:00
James R
ed9d5960ef Merge branch 'lastlineshit' into 'next' 
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability

See merge request STJr/SRB2!1271
 2020-12-10 15:14:16 -05:00
James R
fc27bbc6e4 Merge branch 'no-spin-jump' into 'next' 
Fix a Few Spin Related Bugs (Closes #286 and #360)

Closes #286 and #360

See merge request STJr/SRB2!1256
 2020-12-10 15:02:29 -05:00
Zippy_Zolton
629b6d3bab CTF text 2, branch is finished 2020-12-08 16:09:51 -06:00
Jaime Ita Passos
3f36a51f5b Move a few mobj spawn defaults to its own function 2020-12-06 17:46:35 -03:00
Tatsuru
0e92f1818c Kill saloon doors without a tracer, add height check for non-blocking doors 2020-12-06 14:11:08 -03:00
Zippy_Zolton
dc53970fac g 2020-12-03 02:05:10 -06:00
Zippy_Zolton
5fc6864cc2 Fix fire objects disappearing in lava 2020-12-03 01:28:54 -06:00
Tatsuru
2f44a9ab02 Don't spawn the projectile if you're just gonna delete it 2020-12-02 12:05:40 -03:00
SMS Alfredo
12f36719b4 Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability 2020-11-25 14:31:24 -06:00
Jaime Ita Passos
be274a4fa9 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
Sally Coolatta
d0ca3b78c1 Merge branch 'master' into battle-rethink 2020-11-18 17:49:06 -05:00
SMS Alfredo
4272788c9a Allow no spin characters to water skip while spinning 2020-11-18 12:35:40 -06:00
Sal
b2eb64ac09 Merge branch 'roll-and-tilt' into 'master' 
Roll & pitch replace modeltilt

See merge request KartKrew/Kart!326
 2020-11-17 20:03:48 -05:00
Sally Coolatta
e16c7d722f Cherry-pick e1b265df2 2020-11-16 19:55:28 -05:00
Sally Coolatta
14b379fd27 Cherry-pick 4eb69a664 2020-11-16 19:52:26 -05:00
James R
34450fa028 Don't add translucency to THOK 
Various visuals use THOKS, maybe there should be another barebones type with
no extra handling. But this is good enough for now.
 2020-11-16 10:17:46 -08:00
Sally Coolatta
c31efd8631 Give bumper destruction some sound effects 2020-11-16 02:59:41 -05:00
Sally Coolatta
ef0da6ce9c Finished bumper destruction 2020-11-16 02:38:13 -05:00
Sally Coolatta
0dc567973c Overtime: Chaos Emeralds get deleted by the barrier, and respawn in the middle 2020-11-16 01:29:09 -05:00
Sally Coolatta
8c5abf41ea Bumper destruction starts with the normal bumper sprite before transitioning into the giant bumper 2020-11-16 01:20:55 -05:00
Sally Coolatta
ae5d5abe24 Chaos Emeralds now sparkle 2020-11-16 00:51:00 -05:00
Sally Coolatta
42f411399a Add bumper explosion effect 2020-11-15 12:56:03 -05:00
Sally Coolatta
827a1b5fca Refactor stealing & destroying bumpers 
- Prevents being able to farm extra bumpers off of karma players
- Paves the way for bumper destroy animation later
 2020-11-15 06:25:38 -05:00
James R
e1a8a393a3 Merge branch 'udmf-multitag' into 'next' 
UDMF: Multitag support

See merge request STJr/SRB2!1097
 2020-11-14 19:18:14 -05:00
lachwright
ce06031f5e Reallow P_MobjSpawn to change the scale of objects spawned from mapthings 2020-11-15 02:53:10 +11:00
Nev3r
003f46c18e Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00
Sally Coolatta
1a58d0d24b Try and fix hitlag damage, lightning shield, & punting mines 2020-11-12 01:43:37 -05:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Sally Coolatta
2b3a86d4b4 Merge branch 'master' into hitlag-retry 2020-11-10 21:37:09 -05:00
Sal
27530dec06 Merge branch 'spindash-efx' into 'master' 
Spindash EFX Part 1

See merge request KartKrew/Kart!331
 2020-11-10 19:56:01 -05:00
Nev3r
c22dbe1d2e rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro. 2020-11-10 12:22:55 +01:00
James R
d7a0c8ae0a Setting the ambush flag on any MF_SPRING thing toggles MF_NOGRAVITY 2020-11-08 20:15:17 -08:00
Sally Coolatta
39acb46903 Last 3/4s: Spindash wind 2020-11-08 15:32:30 -05:00
Sally Coolatta
0e28470228 Merge master 2020-11-08 02:34:24 -05:00
Sally Coolatta
9434dd3ae3 Make the stuff that lost it use K_MomentumAngle again 2020-11-08 02:10:53 -05:00
Sally Coolatta
470e399abe Merge master, add support for hitlag jitter in OpenGL 2020-11-08 01:56:27 -05:00
Jaime Passos
da0f2286e3 P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope 2020-11-05 00:42:14 -03:00
Sally Coolatta
961ff69241 You can drop Chaos Emeralds 2020-11-02 00:41:41 -05:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds 
Functional! However, you don't drop them yet.
 2020-11-01 23:44:54 -05:00
Sally Coolatta
619402666a Better Jawz 
- More friction in Battle
- Throwables take your momz (has been bothering me for an eternity)
 2020-10-30 22:57:42 -04:00
Sally Coolatta
64c321fbed Fix incorrect tilts 2020-10-28 21:05:58 -04:00
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
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