Commit graph

14498 commits

Author SHA1 Message Date
Jaime Passos
d2bc3de4ae Moved this macro 2019-09-12 16:03:44 -03:00
TehRealSalt
97b09ba9c1 Grease part 2 2019-09-12 14:23:45 -04:00
Steel Titanium
5ba4e604b2 Merge branch 'newicon' into 'master'
New EXE icon

See merge request STJr/SRB2Internal!265
2019-09-12 14:05:32 -04:00
Jaime Passos
e3ceadbfe3 Fix powers-of-two checks 2019-09-12 14:32:31 -03:00
toaster
88000b87b0 I_Error if no frames are found for a loaded skin's SPR2_STND subspriteset, given this is what everything will default to if nothing else is provided, and I really don't wanna go across the code adding checks for sprite2s not existing (since R_GetSkinSprite2, under all circumstances other than this one, is capable of bouncing back). 2019-09-12 12:52:25 +01:00
TehRealSalt
56c9641488 Back to old thrusts 2019-09-12 02:18:07 -04:00
TehRealSalt
5fd6d86b41 Merge branch 'rings_slopechange' into greased-horizontals 2019-09-12 02:01:52 -04:00
TehRealSalt
d3f1b4f82c Greased horizontals 2019-09-12 02:01:30 -04:00
TehRealSalt
d4d03f907b Remove commented out code 2019-09-12 00:32:47 -04:00
TehRealSalt
55caae6d1a Remove teleporting jank from springs, set angle when going directly against a horizontal/diagonal spring 2019-09-12 00:31:51 -04:00
TehRealSalt
abfc1915c5 Fixed horizontal springs having gravity 2019-09-12 00:10:06 -04:00
TehRealSalt
e0a177e612 Horizontal springs, bigger hitboxes, springs use the meatier Sonic 3 sound effect 2019-09-11 23:33:33 -04:00
Jaime Passos
772cc25f0b Make nametags compatible with current player.dta
(again)
2019-09-11 22:18:03 -03:00
Jaime Passos
9b5a7309bd Merge remote-tracking branch 'origin/master' into newmenus 2019-09-11 22:17:42 -03:00
Jaime Passos
f91e8e126e Crash prevention 2019-09-11 20:38:15 -03:00
Steel Titanium
cb539e405c Merge branch 'master' into update-libs 2019-09-11 19:26:51 -04:00
Jaime Passos
6a7454acf7 Read user chunks 2019-09-11 20:18:04 -03:00
Jaime Passos
df966fe305 Merge remote-tracking branch 'origin/master' into png-patches 2019-09-11 17:08:17 -03:00
Jaime Passos
6623359b06 Transparency, not translucency 2019-09-11 17:03:50 -03:00
Jaime Passos
1dbbb226a9 Allow PNG graphics to be used as patches
Also allows them to be used as sprites.
2019-09-11 16:59:28 -03:00
Latapostrophe
cf9385c307 forgot to reset variables on demo stop 2019-09-11 21:30:11 +02:00
toaster
1112730d8a Increase maximum number of Luabanks to 16 on Steel's suggestion. (Using the Web IDE 'cuz I'm tired, so no new exe; luckily I made the code flexible to constant replacement!) 2019-09-11 14:22:56 -04:00
toaster
22f7fd904f Merge branch 'musicplus-resetmusic-followup' into 'master'
Follow-up fixes for reset-upon-dying music

See merge request STJr/SRB2Internal!284
2019-09-11 14:14:09 -04:00
toaster
e99b0869a3 Forgot to put these in Lua. (Not gonna make a fifth exe today just for this one change, though.) 2019-09-11 17:32:41 +01:00
Steel Titanium
63c99dd28f Merge branch 'gl_skydome' into 'master'
OpenGL sky dome

See merge request STJr/SRB2Internal!326
2019-09-11 11:58:05 -04:00
Steel Titanium
2339d60276 Merge branch 'ast_newstyles' into 'master'
Patch translucency styles

See merge request STJr/SRB2Internal!324
2019-09-11 11:57:45 -04:00
Steel Titanium
d03a0f2edc Merge branch 'flats-png_port' into 'master'
Flats png port, fixed

See merge request STJr/SRB2Internal!323
2019-09-11 11:57:29 -04:00
James
5404fce6e4 Added cam_adjust, de-ghettoified the camera in general 2019-09-11 10:45:59 -04:00
toaster
840eecbb02 Fix an issue where completing a stage normally would not correctly set startrings for the next one (as opposed to warping directly or dying inside it). 2019-09-11 14:25:22 +01:00
toaster
534cc1fa67 Fix the Save Select platter drawing for the new player signpost art.
This might LOOK like an unrelated change, but it needs a new player.dta, so might as well keep that all localised!
2019-09-11 13:32:12 +01:00
toaster
1695e4102f Tweak gameovertics slightly to avoid having no sound for too long. 2019-09-11 13:30:24 +01:00
toaster
667dcd5bca Continue screen! With aaaaaall the new assets to go with it.
* https://cdn.discordapp.com/attachments/428262628893261828/621129794045870108/srb20077.gif
* https://cdn.discordapp.com/attachments/428262628893261828/621129785124585502/srb20078.gif
* I will be accepting no further questions at this time.
2019-09-11 00:50:51 +01:00
Jaime Passos
0695b6ecc1 Merge remote-tracking branch 'origin/master' into gl_skydome 2019-09-10 19:20:20 -03:00
Jaime Passos
db1e38451e Fix titlemap* crash 2019-09-10 18:34:29 -03:00
Jaime Passos
2e93068618 Fix title screen crash 2019-09-10 18:33:06 -03:00
Jaime Passos
b36418882f Oops. 2019-09-10 18:17:02 -03:00
Jaime Passos
ce8b821691 Merge remote-tracking branch 'jimita/renderswitch' into renderswitch 2019-09-10 18:12:01 -03:00
Jaime Passos
285ba4ee06 Enable usage of R_DrawSpan_8_MMX if drawing a flat with powers-of-two dimensions 2019-09-10 17:25:21 -03:00
Jaime Passos
356e3c274d Disable LUA_PATCH_SAFETY because I trust Lua scripters enough
haha........ha.................
2019-09-10 16:59:37 -03:00
Jaime Passos
fe3ee4f8fd some adjusts 2019-09-10 16:54:40 -03:00
James
0208de2d5b Lach has blessed us with a remade cam_adjust. 2019-09-10 10:11:03 -04:00
toaster
ca616fe314 Add the new s1, s2, cd, 3db and kc sounds to sounds.c and sounds.h!
These have been in srb2.pk3 for a while, but they were inaccessible because of not having in-game references.
2019-09-10 15:06:20 +01:00
toaster
038340ff46 Update SPR2 defaulting for SPR2_CNT1. 2019-09-10 14:44:04 +01:00
Latapostrophe
7ca181df6e forgot to add back 'void' after undoing experiments 2019-09-10 13:52:32 +02:00
Latapostrophe
0599d23254 get replays to save player lua vars 2019-09-10 11:59:17 +02:00
Jaime Passos
53568ba62f Better fades 2019-09-09 23:31:48 -03:00
Jaime Passos
2b6ae5081a Attempt to fix warnings 2019-09-09 19:34:51 -03:00
Jaime Passos
fe737c33f6 Comments 2019-09-09 19:27:08 -03:00
Jaime Passos
36e305735f menu changes 2019-09-09 17:53:34 -03:00
Jaime Passos
d534b0f1f4 D_SRB2Loop: Draw CONSBACK even in OpenGL 2019-09-09 17:35:38 -03:00