Commit graph

1105 commits

Author SHA1 Message Date
James R
71553a8ad0 Merge branch 'battle-rethink' into 'master'
Battle rethink

See merge request KartKrew/Kart!335
2020-11-29 19:13:38 -05:00
toaster
f72108c4fa A whole bunch of cleanup to get most record attack/replay stuff reasonably functional.
* Fix the screen being stuck black at the very start of start record attack.
* Bump up the demoversion to 7, because I want all previous v2 demos to be guaranteed kaput (it was previously 4, but 7 is a nice number).
* Fix a ton MORE shitcausing misalignments in the replay system, this time specifically focused on getting ghosts functional.
* Plug a few holes in the "best lap" record implementation that allowed for stupidly easy records due to the way v2's finish lines work.
* Make a few follower-related things sane, to prevent spurious console prints that were getting in the way of my test prints.
2020-11-27 20:30:28 +00:00
SMS Alfredo
f4c640394f Allow the Forcespin sector type to be used with intangible fofs
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
2020-11-18 12:27:09 -06:00
SMS Alfredo
302ff8e43b Allow forcespin sectors to work on no spin characters 2020-11-18 11:49:17 -06:00
Sally Coolatta
14b379fd27 Cherry-pick 4eb69a664 2020-11-16 19:52:26 -05: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
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Nev3r
38e17d556e Forgot to change %d to %s for sizeu1(). 2020-11-10 13:11:42 +01:00
Nev3r
f28a4077ba Remove unused tag parameter. 2020-11-10 13:10:01 +01:00
Nev3r
7f14edf62e Use sizeu1() 2020-11-10 12:34:08 +01: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
Sally Coolatta
0e28470228 Merge master 2020-11-08 02:34:24 -05:00
Sally Coolatta
470e399abe Merge master, add support for hitlag jitter in OpenGL 2020-11-08 01:56:27 -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
James R
1db88decce Put a run time warning that 415 doesn't work 2020-11-01 19:43:26 -08:00
James R
8f68a21f2f Fix many instances of G_BuildMapName
Some things are gonna be busted. Fix it later, BYE.
2020-10-31 20:17:12 -07: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
Sryder
11386e12ba Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum
Should have easier merging and be less likely to break current effects.
2020-10-26 11:18:53 +00:00
Sryder
a585d3c9d1 Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps"
This reverts commit dc453fbbda.
2020-10-26 11:07:17 +00:00
Sryder
dc453fbbda Fix various things that used NUMTRANSMAPS for the number of translucent trans maps 2020-10-25 23:19:20 +00: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
884eb3d515 Error icon for when a map is missing its signpost 2020-09-30 06:00:13 -04:00
Sally Coolatta
2f6962c103 Correct player angle when respawning from crushing 2020-09-26 03:12:22 -04:00
Sally Coolatta
efaf2c8c7d Remove print 2020-09-26 02:00:18 -04:00
James R
3cad7398f0 Fix slope spawning; let polyobjects spawn again
Move P_SpawnMapThings before P_SpawnSpecialsThatRequireObjects.

Do not remove special from lines with ML_NETONLY or ML_NONET until after
slopes are spawned.
2020-09-25 13:35:56 -07: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
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
Lachlan Wright
500e0dfba1 Merge branch 'fix-236' into 'next'
Only allow explicitly living players to trigger sector specials

Closes #236

See merge request STJr/SRB2!1152
2020-09-25 09:31:06 -04:00
Lachlan Wright
ed58fab45f Merge branch 'dye-fix' into 'next'
Fix players not properly decolorizing via linedef action

See merge request STJr/SRB2!1127
2020-09-25 08:54:16 -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
James R
0d573b514e Stupid polyobjects require things to be spawned >:( 2020-09-24 15:10:07 -07:00
James R
388d56a5f8 Search FOF target sectors for slope anchors
Requires spawning fake floors before slopes, and therefore before things,
basically before everything. Hopefully nothing breaks!
2020-09-24 01:56:38 -07:00
toaster
eb48f71f89 Fix deathpits not vwooping you around 2020-09-22 14:43:25 +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
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
lachwright
511518f0e4 Only allow explicitly living players to trigger sector specials 2020-09-20 11:49:53 +09:30
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
SteelT
6a168ac5e9 Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Tatsuru
57b1becfe0 Decolorize players as intended 2020-08-24 23:53:21 -03: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
James R
a566a8e245 Revert "Disable animated textures"
This reverts commit 5e13555727.
2020-08-16 00:10:49 -07:00
Sally Coolatta
a251c3909b Lots of little fixes
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
Sally Coolatta
5e13555727 Disable animated textures 2020-08-16 00:16:17 -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
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -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
9b9ab8a2d5 Get up to p_user 2020-08-14 23:23:14 -04:00