James R
|
54da9552de
|
Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3
|
2020-11-22 14:41:42 -08:00 |
|
James R
|
30792e7820
|
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
|
92625483a4
|
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
|
bec85c033a
|
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
|
eb28532244
|
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
|
6d6eb79226
|
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
|
e17b4d0299
|
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
|
2e21168395
|
Free GPU textures when adding a file
|
2020-11-22 18:23:35 -03:00 |
|
Riku Salminen
|
b9fa50f7ef
|
No need to reset tokens twice
|
2020-11-22 23:23:32 +02:00 |
|
Riku Salminen
|
f51be77aa2
|
Now the fix actually does what the MR says... +lua banks
|
2020-11-22 23:19:24 +02:00 |
|
Jaime Ita Passos
|
0645c642d2
|
Improve GPU texture management.
|
2020-11-22 18:18:26 -03:00 |
|
Jaime Ita Passos
|
abe35fd008
|
Some interface fixes
|
2020-11-22 17:22:18 -03:00 |
|
Jaime Ita Passos
|
152c540c1e
|
Fix sprite textures in models
|
2020-11-22 17:10:10 -03:00 |
|
Jaime Ita Passos
|
9ab3acae2d
|
Change how texture deletion works in OpenGL
|
2020-11-22 17:03:04 -03:00 |
|
Jaime Ita Passos
|
071ec73389
|
Some fixes for spritestuff2
|
2020-11-22 03:47:15 -03:00 |
|
GoldenTails
|
e3c6d1cef3
|
Add NOECHOFILENAMES, if people don't want logspam.
|
2020-11-21 22:21:18 -06:00 |
|
James R
|
5a8e653cd5
|
More concise
|
2020-11-21 13:43:32 -08:00 |
|
James R
|
377a9c10f0
|
Lua: disallow bitwise not on anything but number values
This fixes a crash.
|
2020-11-21 13:37:45 -08:00 |
|
Nev3r
|
e95a05880f
|
Merge branch 'spritestuff2' into 'next'
New sprite features
See merge request STJr/SRB2!1257
|
2020-11-21 10:51:56 -05:00 |
|
GoldenTails
|
8cfa21fb20
|
Echo filenames when compiling without ECHO=1
|
2020-11-19 15:17:56 -06:00 |
|
Jaime Ita Passos
|
389763a550
|
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
|
5e890ee6f8
|
Merge branch 'next' into spritestuff2
|
2020-11-19 00:52:43 -03:00 |
|
SMS Alfredo
|
9163e73092
|
Allow no spin characters to water skip while spinning
|
2020-11-18 12:35:40 -06:00 |
|
SMS Alfredo
|
7ad8aa1477
|
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
|
01a03a4daa
|
lmao formatting
|
2020-11-18 12:03:48 -06:00 |
|
SMS Alfredo
|
09644d69c0
|
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
|
16fd754a39
|
Allow forcespin sectors to work on no spin characters
|
2020-11-18 11:49:17 -06:00 |
|
SMS Alfredo
|
ad9bf6085f
|
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
|
85c5fa9527
|
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 |
|
SMS Alfredo
|
fb40a28365
|
Do deh thing
|
2020-11-17 11:47:33 -06:00 |
|
lachwright
|
5454068843
|
Uncap palette lump palettes & allow flashpal palettes to display during pause
|
2020-11-16 17:37:12 +11:00 |
|
lachwright
|
26b6b33220
|
Add parentheses
|
2020-11-15 15:52:55 +11:00 |
|
Louis-Antoine
|
b03d2b16ed
|
Delete unneeded check
|
2020-11-15 01:24:12 +01:00 |
|
James R
|
50e15840fb
|
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
|
d3199ac779
|
Fix one last instance of printing address diff
|
2020-11-14 16:18:54 -08:00 |
|
Louis-Antoine
|
13ba25f4fe
|
Only call the Lua API for overridden actions
|
2020-11-15 01:15:58 +01:00 |
|
James R
|
33193db146
|
Remove unused music type enums
|
2020-11-14 15:56:40 -08:00 |
|
Louis-Antoine
|
7e7de16e6b
|
Fix typo
|
2020-11-15 00:53:46 +01:00 |
|
Louis-Antoine
|
f0fdcfb92b
|
Delete outdated comment
|
2020-11-15 00:52:51 +01:00 |
|
James R
|
2a35e0d59f
|
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
|
dfeddafc03
|
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
|
11bb835a45
|
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
|
bd9b11a40c
|
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
|
3a8b2a6fb7
|
Better documentation.
|
2020-11-14 20:50:34 +01:00 |
|
Nev3r
|
cc98be4d23
|
Add documentation for the iterator macros.
|
2020-11-14 20:25:00 +01:00 |
|
Riku Salminen
|
0a1beab8c8
|
Reset a couple of other variables while we're at it
|
2020-11-14 20:17:35 +02:00 |
|
Riku Salminen
|
8814980a06
|
Emeralds and tokens now reset when restarting marathon mode in first level
|
2020-11-14 19:18:36 +02:00 |
|
lachwright
|
a65fc9f622
|
Reallow P_MobjSpawn to change the scale of objects spawned from mapthings
|
2020-11-15 02:53:10 +11:00 |
|
lachwright
|
8f570eaa97
|
Use SDL version of executable icon at runtime on macOS
|
2020-11-15 01:13:41 +11:00 |
|
Louis-Antoine
|
01124f2076
|
Fix Lua stacktrace not showing in various situations
|
2020-11-13 19:12:25 +01:00 |
|