a5ff609873
Read user chunks
2019-09-11 20:18:04 -03:00
affff0a7e5
Merge remote-tracking branch 'origin/master' into png-patches
2019-09-11 17:08:17 -03:00
ed551f2536
Transparency, not translucency
2019-09-11 17:03:50 -03:00
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
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
2ced626518
Merge branch 'gl_skydome' into 'master'
...
OpenGL sky dome
See merge request STJr/SRB2Internal!326
2019-09-11 11:58:05 -04:00
1bafec9f55
Merge branch 'ast_newstyles' into 'master'
...
Patch translucency styles
See merge request STJr/SRB2Internal!324
2019-09-11 11:57:45 -04:00
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
fec579db8c
Merge remote-tracking branch 'origin/master' into gl_skydome
2019-09-10 19:20:20 -03:00
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
aebff2a430
Merge branch 'undo_322' into flats-png_port
2019-09-09 15:05:43 -04:00
470ac5fed2
Revert "Revert "Merge branch 'flats-png_port' into 'master'""
...
This reverts commit 043bb86acd
2019-09-09 15:05:17 -04:00
9d64ee88a0
Be clear on what FALLTHRU we really want
2019-09-09 15:02:13 -04:00
043bb86acd
Revert "Merge branch 'flats-png_port' into 'master'"
...
This reverts merge request !322
2019-09-09 18:40:21 +00:00
0a69190848
Missing arguments
2019-09-09 15:39:10 -03:00
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
6553d816ea
Merge remote-tracking branch 'origin/master' into flats-png_port
2019-09-09 14:12:28 -03:00
8c035ecb86
Merge branch 'lightning_polys' into 'master'
...
Lightning Polys
See merge request STJr/SRB2Internal!294
2019-09-08 19:04:56 -04:00
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
1bf78a2423
Move mobj_t declaration to top of the block
2019-09-08 17:14:47 -04:00
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
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
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
ba50a03d9c
Update SPR2_XTRA references for adjusted player.dta content.
2019-09-08 21:28:12 +01:00
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
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
0ed589449a
Merge branch 'newegg' into 'master'
...
Newegg dot blag
See merge request STJr/SRB2Internal!305
2019-09-08 16:11:50 -04:00
ff1fa3f92b
Implement all the other alpha blend styles
2019-09-08 13:21:00 -03:00
b7c9f15225
Fix NiGHTS attack menu not drawing correct background
2019-09-07 22:00:38 -04:00
4adff34402
opengl patch translucency
2019-09-07 22:43:29 -03:00
a67dd633ff
if that function can't return NULL why should i do this?
2019-09-07 19:02:50 -03:00
3cc2b76fb8
probably want to Z_Free this...............
2019-09-07 18:56:08 -03:00
ff293c3f6f
fix non powers of two spans
2019-09-07 18:20:49 -03:00
d26ff197dc
* Store gravflip ( resolves #206 ) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
...
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191 ).
2019-09-07 22:12:47 +01:00
f461b76bb0
fix translucency
2019-09-07 16:54:26 -03:00
5d85e82fa6
Fix detection of GRADE_ constants in SOC.
2019-09-07 20:08:05 +01:00
c6af108d8c
Merge branch 'musicfixes' into 'master'
...
Minor musicplus-related fixes
See merge request STJr/SRB2Internal!310
2019-09-07 11:45:15 -04:00
d998dad2ad
Merge branch 'stop-bullying-tails' into 'master'
...
Ignore bots when looking for a player
Closes #190
See merge request STJr/SRB2Internal!301
2019-09-07 11:44:46 -04:00
a287b9e317
Merge branch 'fix_skipintro' into 'master'
...
Fix -skipintro in OpenGL
See merge request STJr/SRB2Internal!308
2019-09-07 11:44:09 -04:00
52a4b77f83
Merge branch 'devmode-toggletwod' into 'master'
...
DEVMODE: 2D toggle command
See merge request STJr/SRB2Internal!309
2019-09-07 11:43:01 -04:00
92b77c987b
Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!)
2019-09-07 12:10:50 +01:00
cf4b5a1b9d
* Comment out the notices that the two types of music are disabled (see issue #179 ; not a perfect fix, but good enough for now).
2019-09-07 11:49:13 +01:00
54b89eefbb
* Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations).
2019-09-07 11:48:58 +01:00
bc52bc83cc
2D toggle command
2019-09-06 20:51:39 -04:00
d38ba4d88c
define stuff idk
2019-09-06 19:41:29 -03:00
02a7d8e0a2
Fix tilted spans.
2019-09-06 19:37:07 -03:00
2a85ed0bdd
test
2019-09-06 19:26:05 -03:00
0cc553be5f
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
de4a609421
Merge remote-tracking branch 'origin/master' into fix_skipintro
2019-09-06 16:08:18 -03:00
6aedca899f
2.2 skies aren't flipped
2019-09-05 17:42:36 -03:00
Jaime Passos