Commit graph

17740 commits

Author SHA1 Message Date
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
Sally Coolatta
14b379fd27 Cherry-pick 4eb69a664 2020-11-16 19:52:26 -05:00
Sally Coolatta
6a4eb721bd The real problem 2020-11-16 18:35:07 -05:00
Sally Coolatta
082d253553 Remove bot friction
Not convinced this fixes anything anymore
2020-11-16 17:00:21 -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
4d881f3279 Merge branch 'master' into battle-rethink 2020-11-16 03:09:13 -05: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
lachwright
6f315c7bb1 Uncap palette lump palettes & allow flashpal palettes to display during pause 2020-11-16 17:37:12 +11: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
0db31e0fcd HUD polish
- Emeralds have background & white flashing
- Blue sphere meter has shading
- V_SLIDEIN works off of lt_exitticker instead of introtime
2020-11-16 00:17:40 -05:00
Sally Coolatta
0dc0ff8e6f More finalized Chaos Emerald visuals 2020-11-15 15:11:13 -05:00
Sally Coolatta
0882fe2b01 Change overtime center hitbox 2020-11-15 12:59:05 -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
lachwright
dd4065795a Add parentheses 2020-11-15 15:52:55 +11:00
Louis-Antoine
31f5cada65 Delete unneeded check 2020-11-15 01:24:12 +01: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
James R
01e232ac3b Fix one last instance of printing address diff 2020-11-14 16:18:54 -08:00
Louis-Antoine
ff7ca5450f Only call the Lua API for overridden actions 2020-11-15 01:15:58 +01:00
James R
66edde2556 Remove unused music type enums 2020-11-14 15:56:40 -08:00
Louis-Antoine
b44ea720d0 Fix typo 2020-11-15 00:53:46 +01:00
Louis-Antoine
a78097060f Delete outdated comment 2020-11-15 00:52:51 +01:00
James R
0527e60928 Merge branch 'lua-musicfuncs' into 'next'
Expose more music functions to Lua

See merge request STJr/SRB2!1230
2020-11-14 18:51:22 -05:00
James R
cba81f48b1 Merge branch 'nolua2' into 'next'
Don't let Lua set cvars that have CV_NOLUA

See merge request STJr/SRB2!1245
2020-11-14 18:37:21 -05:00
James R
c5dcd44011 Merge branch 'precip-bad-access' into 'next'
Fix potential crash with precipitation in OpenGL

See merge request STJr/SRB2!1249
2020-11-14 18:33:58 -05:00
James R
a1459356c8 Merge branch 'mobjspawnscale' into 'next'
Reallow P_MobjSpawn to change the scale of objects spawned from mapthings

Closes #328

See merge request STJr/SRB2!1251
2020-11-14 18:08:40 -05:00