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 |
|
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 |
|
Jaime Passos
|
59f403d67b
|
lua stuff
|
2019-09-09 17:24:13 -03:00 |
|
Jaime Passos
|
073e33de21
|
yet even more cleanup here
|
2019-09-09 16:31:30 -03:00 |
|
Jaime Passos
|
371e160940
|
I am the CEO of renderers
|
2019-09-09 16:20:17 -03:00 |
|
Alam Ed Arias
|
37d6106619
|
Merge branch 'undo_322' into flats-png_port
|
2019-09-09 15:05:43 -04:00 |
|
Alam Ed Arias
|
8eb6c3a50c
|
Revert "Revert "Merge branch 'flats-png_port' into 'master'""
This reverts commit 8286f55e8e.
|
2019-09-09 15:05:17 -04:00 |
|
Alam Ed Arias
|
8a69d97a12
|
Be clear on what FALLTHRU we really want
|
2019-09-09 15:02:13 -04:00 |
|
Nev3r
|
8286f55e8e
|
Revert "Merge branch 'flats-png_port' into 'master'"
This reverts merge request !322
|
2019-09-09 18:40:21 +00:00 |
|
Jaime Passos
|
fd39522310
|
Missing arguments
|
2019-09-09 15:39:10 -03:00 |
|
Nev3r
|
845e86ec12
|
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
|
2574914843
|
Merge remote-tracking branch 'origin/master' into flats-png_port
|
2019-09-09 14:12:28 -03:00 |
|
toaster
|
41727318ff
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
|
2019-09-09 15:25:48 +01:00 |
|
toaster
|
7eaf43810a
|
DON'T PUSH ALONE - first dregs of continue screen
|
2019-09-09 15:25:36 +01:00 |
|
Jaime Passos
|
93ea8c4019
|
can i push this already?
|
2019-09-08 22:25:18 -03:00 |
|
Jaime Passos
|
11077c2bac
|
still making things better
|
2019-09-08 21:37:24 -03:00 |
|
Steel Titanium
|
e1b14d3d7d
|
Fix function being redefined
|
2019-09-08 19:39:23 -04:00 |
|
toaster
|
ec76002d9f
|
Merge branch 'lightning_polys' into 'master'
Lightning Polys
See merge request STJr/SRB2Internal!294
|
2019-09-08 19:04:56 -04:00 |
|
toaster
|
74e6c147d7
|
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 |
|
Jaime Passos
|
61a16d43f5
|
more stuff. i hope i didnt mess this up.
|
2019-09-08 18:59:49 -03:00 |
|
Jaime Passos
|
1cb22d5e6b
|
initial stuff
|
2019-09-08 18:44:40 -03:00 |
|
Jaime Passos
|
398b320aec
|
initial stuff
|
2019-09-08 18:27:35 -03:00 |
|
Steel Titanium
|
8d2f3eb575
|
Move mobj_t declaration to top of the block
|
2019-09-08 17:14:47 -04:00 |
|
Steel Titanium
|
b979594c17
|
Fix this mistake
|
2019-09-08 16:54:40 -04:00 |
|
Monster Iestyn
|
361fbf8f6a
|
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
|
14c44a6825
|
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
|
0217d693f2
|
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
|
380f9ec07d
|
Update SPR2_XTRA references for adjusted player.dta content.
|
2019-09-08 21:28:12 +01:00 |
|
toaster
|
1e11fe650f
|
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
|
17a2038489
|
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
|
f523cb107e
|
Merge branch 'newegg' into 'master'
Newegg dot blag
See merge request STJr/SRB2Internal!305
|
2019-09-08 16:11:50 -04:00 |
|
toaster
|
8acf86cf10
|
Extend gameovertics again by two seconds.
|
2019-09-08 18:03:51 +01:00 |
|
toaster
|
abcf4f82ad
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
|
2019-09-08 18:00:25 +01:00 |
|
toaster
|
5eb6b408a1
|
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
|
87f0013831
|
Implement all the other alpha blend styles
|
2019-09-08 13:21:00 -03:00 |
|