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 |
|
James
|
737690c8b8
|
Added cam_adjust, de-ghettoified the camera in general
|
2019-09-11 10:45:59 -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 |
|
Jaime Passos
|
eb1b6eedeb
|
some adjusts
|
2019-09-10 16:54:40 -03:00 |
|
James
|
4be108fa76
|
Lach has blessed us with a remade cam_adjust.
|
2019-09-10 10:11:03 -04: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 |
|
Jaime Passos
|
f0788598c9
|
Better fades
|
2019-09-09 23:31:48 -03: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 |
|
Steel Titanium
|
555b4e1766
|
Fix function being redefined
|
2019-09-08 19:39:23 -04: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 |
|
Steel Titanium
|
cc80cd77c5
|
Fix this mistake
|
2019-09-08 16:54:40 -04:00 |
|
Monster Iestyn
|
c696063260
|
Merge branch 'mprelated-tweaks' into 'master'
Various improvements and changes to multiplayer menu
See merge request STJr/SRB2Internal!300
|
2019-09-08 16:45:14 -04:00 |
|
toaster
|
9041a399c6
|
Merge branch 'nightsattackfixes' into 'master'
NiGHTS attack fixes
Closes #205
See merge request STJr/SRB2Internal!319
|
2019-09-08 16:42:45 -04:00 |
|
toaster
|
e03d03110b
|
Merge branch 'ending-star' into 'master'
Endings: Fireworks fallback graphics.
See merge request STJr/SRB2Internal!296
|
2019-09-08 16:28:52 -04:00 |
|
toaster
|
ba50a03d9c
|
Update SPR2_XTRA references for adjusted player.dta content.
|
2019-09-08 21:28:12 +01:00 |
|
toaster
|
6815748a3e
|
Merge branch 'flippost' into 'master'
Flippost
Closes #206 and #191
See merge request STJr/SRB2Internal!320
|
2019-09-08 16:24:58 -04:00 |
|
toaster
|
11e3f5ec96
|
Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale.
|
2019-09-08 21:21:36 +01:00 |
|
toaster
|
0ed589449a
|
Merge branch 'newegg' into 'master'
Newegg dot blag
See merge request STJr/SRB2Internal!305
|
2019-09-08 16:11:50 -04:00 |
|
toaster
|
2c898841e9
|
Extend gameovertics again by two seconds.
|
2019-09-08 18:03:51 +01:00 |
|
toaster
|
4dc9a95224
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
|
2019-09-08 18:00:25 +01:00 |
|
toaster
|
2e90c40934
|
Fade time before Game Over track.
Notably, can no longer use P_PlayJingle because of pre-fade.
|
2019-09-08 18:00:01 +01:00 |
|
Jaime Passos
|
ff1fa3f92b
|
Implement all the other alpha blend styles
|
2019-09-08 13:21:00 -03:00 |
|
Steel Titanium
|
995ab1c84d
|
Merge branch 'master' into internal-hotplug-stableid
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
|
2019-09-08 01:55:36 -04:00 |
|
Steel Titanium
|
8ee0a9309b
|
Better directory structure
|
2019-09-08 01:29:09 -04:00 |
|
Steel Titanium
|
807614d02d
|
Add _ to the record and nights attack tracks for organization
|
2019-09-07 22:57:20 -04:00 |
|
Jaime Passos
|
abfa5e10b6
|
Make nametags compatible with current player.dta
|
2019-09-07 23:40:00 -03:00 |
|
