Jaime Passos
|
a6831aff9c
|
compile fix
|
2019-09-17 22:29:53 -03:00 |
|
Jaime Passos
|
3e95451960
|
Merge branch 'revert-2ced6265' into 'master'
Revert "Merge branch 'gl_skydome' into 'master'"
See merge request STJr/SRB2Internal!331
|
2019-09-17 21:14:52 -04:00 |
|
Alam Ed Arias
|
35e3d9acab
|
Revert "Merge branch 'gl_skydome' into 'master'"
This reverts merge request !326
|
2019-09-17 20:20:09 +00:00 |
|
Alam Ed Arias
|
2a33ffb7d7
|
PNG support: use png_const_bytep, so we do not drop const type
|
2019-09-17 16:18:54 -04:00 |
|
toaster
|
e179e1f9c4
|
Merge branch 'morecactis' into 'master'
More harmful cactus
See merge request STJr/SRB2Internal!329
|
2019-09-16 16:36:06 -04:00 |
|
Nev3r
|
777e7f8760
|
Merge branch 'deathstuff' into 'master'
Lots of death stuff
Closes #207
See merge request STJr/SRB2Internal!306
|
2019-09-16 16:32:45 -04:00 |
|
Nev3r
|
21b5ebf6fa
|
Merge branch 'abilityclean' into 'master'
Clean up an ungodly amount of shit relating to abilities.
Closes #195, #167, and #177
See merge request STJr/SRB2Internal!307
|
2019-09-16 16:09:20 -04:00 |
|
toaster
|
71cc09c8c2
|
Merge branch 'luabanks' into 'master'
Lua save-banks!
See merge request STJr/SRB2Internal!295
|
2019-09-16 07:56:49 -04:00 |
|
Jaime Passos
|
4e1791bbf4
|
Merge branch 'croppedpatchbleed' into 'master'
Fix the V_DrawCroppedPatch bleeding on the current charsel screen.
See merge request STJr/SRB2Internal!311
|
2019-09-15 12:37:46 -04:00 |
|
Jaime Passos
|
32769f6c71
|
Merge branch 'png-patches' into 'master'
PNG patches
See merge request STJr/SRB2Internal!327
|
2019-09-15 12:23:46 -04:00 |
|
Nev3r
|
7fe0636463
|
Merge branch 'horizontal-springs' into 'master'
Always force player camera direction for springs with horizontal thrust component.
See merge request STJr/SRB2Internal!330
|
2019-09-15 12:18:22 -04:00 |
|
Nev3r
|
9771087554
|
Always force player camera direction for springs with horizontal thrust component.
|
2019-09-15 17:43:19 +02:00 |
|
Steel Titanium
|
3ebb9c2c49
|
More harmful cactus
|
2019-09-12 21:36:13 -04:00 |
|
Jaime Passos
|
2a04ac69e1
|
()
|
2019-09-12 16:12:31 -03:00 |
|
Jaime Passos
|
acc8dae274
|
Merge remote-tracking branch 'origin/master' into png-patches
|
2019-09-12 16:04:20 -03:00 |
|
Jaime Passos
|
6c37576bc0
|
Moved this macro
|
2019-09-12 16:03:44 -03:00 |
|
Steel Titanium
|
00d64c380d
|
Merge branch 'newicon' into 'master'
New EXE icon
See merge request STJr/SRB2Internal!265
|
2019-09-12 14:05:32 -04:00 |
|
Jaime Passos
|
a0ec86ce01
|
Fix powers-of-two checks
|
2019-09-12 14:32:31 -03:00 |
|
toaster
|
9006bdd6a3
|
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 |
|
Jaime Passos
|
e3df9cc6b1
|
Crash prevention
|
2019-09-11 20:38:15 -03:00 |
|
Jaime Passos
|
a5ff609873
|
Read user chunks
|
2019-09-11 20:18:04 -03:00 |
|
Jaime Passos
|
affff0a7e5
|
Merge remote-tracking branch 'origin/master' into png-patches
|
2019-09-11 17:08:17 -03:00 |
|
Jaime Passos
|
ed551f2536
|
Transparency, not translucency
|
2019-09-11 17:03:50 -03:00 |
|
Jaime Passos
|
aa91627ba2
|
Allow PNG graphics to be used as patches
Also allows them to be used as sprites.
|
2019-09-11 16:59:28 -03:00 |
|
toaster
|
323c7fa064
|
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
|
440b63ef13
|
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
|
9aed6374cd
|
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
|
2ced626518
|
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
|
1bafec9f55
|
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
|
e7f4017706
|
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 |
|
toaster
|
10a0b38ab1
|
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
|
fe7e374e3b
|
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
|
ab1472bfc1
|
Tweak gameovertics slightly to avoid having no sound for too long.
|
2019-09-11 13:30:24 +01:00 |
|
toaster
|
ed5e8c486c
|
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
|
fec579db8c
|
Merge remote-tracking branch 'origin/master' into gl_skydome
|
2019-09-10 19:20:20 -03:00 |
|
Jaime Passos
|
f1cc17ea02
|
Enable usage of R_DrawSpan_8_MMX if drawing a flat with powers-of-two dimensions
|
2019-09-10 17:25:21 -03:00 |
|
toaster
|
25e975e781
|
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
|
6c2ef39408
|
Update SPR2 defaulting for SPR2_CNT1.
|
2019-09-10 14:44:04 +01:00 |
|
Alam Ed Arias
|
aebff2a430
|
Merge branch 'undo_322' into flats-png_port
|
2019-09-09 15:05:43 -04:00 |
|
Alam Ed Arias
|
470ac5fed2
|
Revert "Revert "Merge branch 'flats-png_port' into 'master'""
This reverts commit 043bb86acd.
|
2019-09-09 15:05:17 -04:00 |
|
Alam Ed Arias
|
9d64ee88a0
|
Be clear on what FALLTHRU we really want
|
2019-09-09 15:02:13 -04:00 |
|
Nev3r
|
043bb86acd
|
Revert "Merge branch 'flats-png_port' into 'master'"
This reverts merge request !322
|
2019-09-09 18:40:21 +00:00 |
|
Jaime Passos
|
0a69190848
|
Missing arguments
|
2019-09-09 15:39:10 -03:00 |
|
Nev3r
|
42040bf038
|
Merge branch 'flats-png_port' into 'master'
Flats png port
See merge request STJr/SRB2Internal!322
|
2019-09-09 14:16:10 -04:00 |
|
Jaime Passos
|
6553d816ea
|
Merge remote-tracking branch 'origin/master' into flats-png_port
|
2019-09-09 14:12:28 -03:00 |
|
toaster
|
2b0344a22f
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
|
2019-09-09 15:25:48 +01:00 |
|
toaster
|
e5d9d3499f
|
DON'T PUSH ALONE - first dregs of continue screen
|
2019-09-09 15:25:36 +01:00 |
|
toaster
|
8c035ecb86
|
Merge branch 'lightning_polys' into 'master'
Lightning Polys
See merge request STJr/SRB2Internal!294
|
2019-09-08 19:04:56 -04:00 |
|
toaster
|
0392cfc158
|
Merge branch 'spawnobject-linedef' into 'master'
Linedef type 461 (Spawn Object)
See merge request STJr/SRB2Internal!304
|
2019-09-08 18:58:50 -04:00 |
|
Steel Titanium
|
1bf78a2423
|
Move mobj_t declaration to top of the block
|
2019-09-08 17:14:47 -04:00 |
|
