Commit graph

18238 commits

Author SHA1 Message Date
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
Nev3r
cf8e131621 Better documentation. 2020-11-14 20:50:34 +01:00
Nev3r
c5504ffc70 Add documentation for the iterator macros. 2020-11-14 20:25:00 +01:00
Riku Salminen
571d6f2124 Reset a couple of other variables while we're at it 2020-11-14 20:17:35 +02:00
Riku Salminen
33e99a0276 Emeralds and tokens now reset when restarting marathon mode in first level 2020-11-14 19:18:36 +02:00
lachwright
ce06031f5e Reallow P_MobjSpawn to change the scale of objects spawned from mapthings 2020-11-15 02:53:10 +11:00
lachwright
3840303b02 Use SDL version of executable icon at runtime on macOS 2020-11-15 01:13:41 +11:00
James R
bd61f216c8 Always unmute music on refocus
If the game is paused, music will be resumed when unpause anyway.
2020-11-13 17:30:23 -08:00
Louis-Antoine
05ae84bd09 Fix Lua stacktrace not showing in various situations 2020-11-13 19:12:25 +01:00
Louis-Antoine
2ebbbecf94 Add missing lua_pop call 2020-11-13 18:19:13 +01:00
Louis-Antoine
4938015253 Replace lua_pop(-1) with lua_settop(0) 2020-11-13 15:31:11 +01:00
Nev3r
19b11a8c75 Remove direct definition for D__USE_MINGW_ANSI_STDIO, as the latest standards consider this to be deprecated. 2020-11-13 11:33:27 +01:00
James R
3a57e8eca5 Don't use drawflags for drawing precipitation in opengl
drawflags does not exist in precipmobj_t
2020-11-13 00:51:13 -08:00
James R
630dd8acb0 OpenGL: don't access field that doesn't exist in precipmobj_t 2020-11-13 00:46:03 -08:00
Sal
9892acc64f Merge branch 'hole-punch' into 'master'
Hole punching

See merge request KartKrew/Kart!334
2020-11-12 20:37:45 -05:00
James R
ed96a8b432 Don't request hole punch to self, and don't register local server for hole punching 2020-11-12 17:31:16 -08:00
James R
b4e6bc6e67 Ignore zero length packets 2020-11-12 17:08:34 -08:00
James R
c8d4ef64f9 Hole punching 2020-11-12 17:08:34 -08:00
Louis-Antoine
2f7bc4a879 Add a shorthand alias for FRACUNIT 2020-11-12 21:33:47 +01:00
Louis-Antoine
825ae44555 Add shorthand aliases for fixed-point functions 2020-11-12 21:25:31 +01:00
Nev3r
9d1c869aee Fix size_t/INT32 compare. 2020-11-12 13:59:21 +01: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
Nev3r
a9b5e804ca Extern the global tag groups properly. 2020-11-12 12:25:02 +01:00