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 |
|
Jaime Ita Passos
|
b8a13e6006
|
Change how texture deletion works in OpenGL
|
2020-11-22 17:03:04 -03:00 |
|
Jaime Ita Passos
|
6d2742f5fb
|
Some fixes for spritestuff2
|
2020-11-22 03:47:15 -03:00 |
|
GoldenTails
|
b4c88e92d9
|
Add NOECHOFILENAMES, if people don't want logspam.
|
2020-11-21 22:21:18 -06:00 |
|
James R
|
cb1326b0eb
|
Remove Direct Draw from the Makefiles
MINGW/MINGW64 implies SDL.
|
2020-11-21 15:19:54 -08:00 |
|
James R
|
11060253f8
|
More concise
|
2020-11-21 13:43:32 -08:00 |
|
James R
|
3b30cc408f
|
Lua: disallow bitwise not on anything but number values
This fixes a crash.
|
2020-11-21 13:37:45 -08:00 |
|
Nev3r
|
bca0fa2017
|
Merge branch 'spritestuff2' into 'next'
New sprite features
See merge request STJr/SRB2!1257
|
2020-11-21 10:51:56 -05:00 |
|
GoldenTails
|
f49136136a
|
Echo filenames when compiling without ECHO=1
|
2020-11-19 15:17:56 -06:00 |
|
GoldenTails
|
9f6a980c7b
|
Move the GIF downscaling menu option up one to create some parity.
|
2020-11-19 13:45:04 -06:00 |
|
GoldenTails
|
320b5db5eb
|
Add a menu option for aPNG downscaling.
|
2020-11-19 13:45:04 -06:00 |
|
GoldenTails
|
676f758d39
|
Add aPNG downscaling, and its associated consvar.
|
2020-11-19 13:45:04 -06:00 |
|
Jaime Ita Passos
|
09fe7d5f1b
|
Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations
|
2020-11-19 00:59:37 -03: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 |
|
Sally Coolatta
|
350a8bd5c4
|
We can bring this back now
|
2020-11-18 17:24:03 -05:00 |
|
Sally Coolatta
|
931bcb3c2a
|
Fix laps counter after finishing
|
2020-11-18 17:10:48 -05:00 |
|
Sally Coolatta
|
a4cd61d226
|
Make i consistent with orbs variable
|
2020-11-18 17:08:54 -05:00 |
|
SMS Alfredo
|
4272788c9a
|
Allow no spin characters to water skip while spinning
|
2020-11-18 12:35:40 -06: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
|
ec291ec3e3
|
lmao formatting
|
2020-11-18 12:03:48 -06:00 |
|
SMS Alfredo
|
dc51465195
|
Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags
|
2020-11-18 12:01:06 -06:00 |
|
SMS Alfredo
|
302ff8e43b
|
Allow forcespin sectors to work on no spin characters
|
2020-11-18 11:49:17 -06:00 |
|
SMS Alfredo
|
826a4429dd
|
Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING
|
2020-11-18 11:28:31 -06:00 |
|
James R
|
1d107b268c
|
Merge branch 'unfuck-icon-mac' into 'next'
Use SDL version of executable icon at runtime on macOS
See merge request STJr/SRB2!1250
|
2020-11-17 20:24:42 -05: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 |
|
Sal
|
39a66078de
|
Merge branch 'additive-models' into 'master'
Add additive/subtractive on models
See merge request KartKrew/Kart!336
|
2020-11-17 19:30:19 -05:00 |
|
Sally Coolatta
|
f4e763ed72
|
Use additive/subtractive on models
|
2020-11-17 18:49:14 -05:00 |
|
SMS Alfredo
|
e099631e3c
|
Do deh thing
|
2020-11-17 11:47:33 -06:00 |
|
Sally Coolatta
|
3983967449
|
Scale tumble height with player speed, not just inflictor speed
|
2020-11-16 20:11:54 -05:00 |
|
Sally Coolatta
|
d7ba48e23e
|
Adjust Land Mine odds
|
2020-11-16 19:55:40 -05:00 |
|
Sally Coolatta
|
e16c7d722f
|
Cherry-pick e1b265df2
|
2020-11-16 19:55:28 -05:00 |
|