Commit graph

17969 commits

Author SHA1 Message Date
toaster
762dfd3063 When resuming from a rewind, don't:
* run wipes again
* run titlecards again
* stop the music
2020-11-28 12:31:16 +00:00
toaster
495e4896dc Fixed Chengi's sprite2 bug, and started on (but haven't nailed down) the rewind crash. 2020-11-28 11:45:25 +00:00
toaster
c2447154ec Bracketing fix for Sryder. 2020-11-28 11:32:29 +00:00
James R
e3cae2315a Add missing *individual* skin flags 2020-11-28 02:22:08 -08:00
James R
7367acf00d Replace TC macros with an enum that automatically counts up
Also fixes TC_DASHMODE not being accessible to Lua.
2020-11-28 02:19:52 -08:00
Sal
57cebd383f Merge branch 'fix-pause-refocus-mute' into 'master'
Fix pausing then refocusing the window causing the music to stay muted

See merge request KartKrew/Kart-Public!244
2020-11-27 16:45:02 -05:00
Sal
46bb13683f Merge branch 'microwavable-thinkframe' into 'next'
Add a Lua global to tell if you are in the preticker

See merge request KartKrew/Kart-Public!245
2020-11-27 16:44:47 -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
toaster
9c0edb097f Fix demos doing incomprehensibly nasty bullshit; now they only desync for a handful of easier-to-hammer-down cases. 2020-11-27 17:59:57 +00:00
toaster
6f6e87f9df Fix replays not being accessible via menus. 2020-11-27 17:32:04 +00:00
Zachary McAlpin
09d4fb3a69 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-26 10:39:41 -06:00
Zippy_Zolton
9a8493f1c4 Fix normal one-up sound playing in Mario mode 2020-11-25 21:46:45 -06:00
James R
d6ed2f4ac8 Merge branch 'spritestuff2-fixes' into 'next'
Some fixes for spritestuff2

See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05: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
SMS Alfredo
0118d60c06 Expose player.skin and player.availabilities to Lua as Read-only 2020-11-25 12:35:36 -06:00
James R
fe031088ae Lua: "defrosting" global to tell how many tics are processing in the preticker 2020-11-24 19:32:01 -08:00
Zachary McAlpin
d418a8cd45 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading 2020-11-24 20:42:08 -06:00
Zachary McAlpin
d96f1738a1 Expose the selectheading option from mapheader_t in Lua 2020-11-24 20:41:11 -06:00
lachwright
9172661e47 Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice 2020-11-24 14:56:22 +11:00
GoldenTails
17092cc5b0 Replace credits with original authors 2020-11-23 21:42:33 -06:00
GoldenTails
d673604b48 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06:00
James R
df6a742547 Merge branch 'fix-dumb-checkstring-typo' into 'next'
Fix a dumb typo of luaL_checklstring i made whoops

See merge request STJr/SRB2!1266
2020-11-23 22:42:00 -05:00
GoldenTails
8a9c3c57f7 Fix a dumb typo of luaL_checklstring i made whoops 2020-11-23 21:20:17 -06:00
Jaime Ita Passos
eee4548d3f Fix a crash 2020-11-23 12:53:59 -03:00
SMS Alfredo
d33aab487a ...snickerdoodles 2020-11-23 09:23:02 -06:00
SMS Alfredo
a60a74e33e Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE 2020-11-23 09:21:00 -06:00
SMS Alfredo
21d9e870aa Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
This reverts commit 826a4429dd.
2020-11-23 09:18:05 -06:00
SMS Alfredo
fee455ec7a Remove unneeded S_PLAY_ROLL check 2020-11-22 23:23:35 -06:00
LJ Sonic
2e71d1be63 Fix PlayerCmd not handling angle and aiming correctly 2020-11-23 01:23:34 +01:00
James R
85bf84193d Merge branch 'make-some-lua-globals-rw' into 'next'
Make several Lua global variables writable.

See merge request STJr/SRB2!1233
2020-11-22 18:47:53 -05:00
James R
bd82b02478 Merge branch 'plane-sorting-fix-part-3' into 'next'
Improved sprite sorting against 3d floors

See merge request STJr/SRB2!1235
2020-11-22 18:31:23 -05:00
James R
e4c7516608 Merge branch 'master' into no-dd-make 2020-11-22 15:29:37 -08:00
James R
4f39497feb Merge branch 'master' into next 2020-11-22 15:23:12 -08:00
James R
fd8a15dc37 Merge remote-tracking branch 'origin/what-is-a-standard-2' 2020-11-22 15:19:39 -08:00
James R
1a2c2c8471 Resolve one last conflict in splat sorting
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
Jaime Ita Passos
490758eac2 Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
James R
d7e32e616d Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3 2020-11-22 14:41:42 -08:00
James R
78c2fa09a0 Merge branch 'flame-orb' into 'next'
Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
James R
ce06077e72 Merge branch 'replay-height-fix' into 'next'
Made height/spinheight and height change values in replays more accurate

See merge request STJr/SRB2!1241
2020-11-22 17:25:41 -05:00
James R
e3142663aa Merge branch 'replay-camera-update' into 'next'
Make the replay camera follow the player

See merge request STJr/SRB2!1243
2020-11-22 17:23:38 -05:00
James R
0d4fc032c5 Merge branch 'remove-unused-music-types' into 'next'
Remove unused music type enums

See merge request STJr/SRB2!1253
2020-11-22 17:16:35 -05:00
James R
1021c51614 Merge branch 'uncap-palettes' into 'next'
Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255
2020-11-22 17:16:21 -05:00
James R
cb203d9366 Merge remote-tracking branch 'origin/master' into no-dd-make 2020-11-22 14:14:43 -08:00
James R
eb7adb0c3f Merge branch 'echo-filenames' into 'master'
Echo filenames when compiling without ECHO=1

See merge request STJr/SRB2!1260
2020-11-22 17:11:03 -05:00
Jaime Ita Passos
0a4a988a33 Free GPU textures when adding a file 2020-11-22 18:23:35 -03:00
Riku Salminen
a336bcf60c No need to reset tokens twice 2020-11-22 23:23:32 +02:00
Riku Salminen
9bb2014a79 Now the fix actually does what the MR says... +lua banks 2020-11-22 23:19:24 +02:00
Jaime Ita Passos
82b11c224a Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos
2170ca3a50 Some interface fixes 2020-11-22 17:22:18 -03:00
Jaime Ita Passos
688384c79b Fix sprite textures in models 2020-11-22 17:10:10 -03:00