Jaime Passos
|
e2ce3988fb
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-09-28 12:14:55 -03:00 |
|
Jaime Passos
|
e95bd8add3
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-09-27 22:53:57 -03:00 |
|
Jaime Passos
|
0346c28cc0
|
ignore TRANSPARENTPIXEL
|
2019-09-23 19:20:59 -03:00 |
|
Jaime Passos
|
be6c8b08ea
|
pixel alpha mistake
|
2019-09-23 18:27:43 -03:00 |
|
Jaime Passos
|
fac1a2b36e
|
patch fixes
|
2019-09-23 18:25:53 -03:00 |
|
Jaime Passos
|
d9777c59e0
|
Merge remote-tracking branch 'origin/master' into flats-png-macro-fix-please-just-work-already
|
2019-09-19 22:41:45 -03:00 |
|
Jaime Passos
|
0ab7573ec7
|
use byteptr.h macros
|
2019-09-19 22:40:23 -03:00 |
|
Jaime Passos
|
f5b7c9951f
|
compile fix
|
2019-09-17 22:29:53 -03:00 |
|
Alam Ed Arias
|
e969ef8930
|
PNG support: use png_const_bytep, so we do not drop const type
|
2019-09-17 16:18:54 -04:00 |
|
Jaime Passos
|
d2bc3de4ae
|
Moved this macro
|
2019-09-12 16:03:44 -03:00 |
|
Jaime Passos
|
f91e8e126e
|
Crash prevention
|
2019-09-11 20:38:15 -03:00 |
|
Jaime Passos
|
6a7454acf7
|
Read user chunks
|
2019-09-11 20:18:04 -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 |
|
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 |
|
Jaime Passos
|
ce8b821691
|
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
|
2019-09-10 18:12:01 -03:00 |
|
Jaime Passos
|
fe3ee4f8fd
|
some adjusts
|
2019-09-10 16:54:40 -03:00 |
|
Jaime Passos
|
53568ba62f
|
Better fades
|
2019-09-09 23:31:48 -03: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
|
11077c2bac
|
still making things better
|
2019-09-08 21:37:24 -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 |
|
Jaime Passos
|
87f0013831
|
Implement all the other alpha blend styles
|
2019-09-08 13:21:00 -03:00 |
|
Jaime Passos
|
45c629c174
|
probably want to Z_Free this...............
|
2019-09-07 18:56:08 -03:00 |
|
Jaime Passos
|
27970e22e1
|
fix translucency
|
2019-09-07 16:54:26 -03:00 |
|
Jaime Passos
|
25bb9d1f88
|
define stuff idk
|
2019-09-06 19:41:29 -03:00 |
|
Jaime Passos
|
b28af03b1c
|
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
|
2019-09-06 19:20:45 -03:00 |
|
Jaime Passos
|
402012e973
|
I
|
2019-08-18 14:16:48 -03:00 |
|
Alam Ed Arias
|
aedcd8b0b9
|
Merge remote-tracking branch 'origin/master' into flats-png
|
2019-07-24 19:07:36 -04:00 |
|
Alam Ed Arias
|
6ea1501edc
|
Merge commit 'd491c62c7c16593b1e050ec5735bec53aa7948d3' into flats-png
|
2019-07-24 18:17:01 -04:00 |
|
Jonas Sauer
|
b7c783223a
|
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
|
2019-07-13 01:42:03 +02:00 |
|
MascaraSnake
|
9f666e125e
|
Merge branch 'master' into thinkerlists
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
|
2019-07-02 23:08:37 +02:00 |
|
Monster Iestyn
|
0fb5a82215
|
Merge branch 'public_next'
# Conflicts:
# src/g_game.c
# src/p_setup.c
# src/p_user.c
# src/r_data.c
|
2019-06-29 20:55:58 +01:00 |
|
Jaime Passos
|
59d5ad193c
|
something something memory leaks
|
2019-06-28 19:43:37 -03:00 |
|
Monster Iestyn
|
9933f98dc2
|
Merge branch 'master' into next
# Conflicts:
# src/r_data.c
|
2019-06-28 23:24:36 +01:00 |
|
Jaime Passos
|
c32e1d2f96
|
Merge remote-tracking branch 'origin/flats' into flats-png
|
2019-06-25 16:04:24 -03:00 |
|
Jaime Passos
|
48c1fcd731
|
Delete R_CropFlat
|
2019-06-25 14:41:07 -03:00 |
|
Monster Iestyn
|
fea05ff9c5
|
Saving work so far, UNTESTED
# Conflicts:
# src/r_data.c
|
2019-06-23 17:51:36 +01:00 |
|
Sryder
|
ef9ad551f6
|
Simply truncate the per-map COLORMAP lump instead of not reading it at all.
Keep the warning though.
|
2019-06-23 15:02:32 +01:00 |
|
Sryder
|
1aa03c01dc
|
Change COLORMAP lump size check to be exact
A lower size could technically be valid, but could easily run into strange issues.
|
2019-06-23 13:49:39 +01:00 |
|
Sryder
|
ac80cc3834
|
Kill Texture SOC feature.
As far as I know it's basically unused, and the strstr is inherently unsafe because there's no guarantee that a patch's contents are NULL terminated.
|
2019-06-23 13:48:29 +01:00 |
|
Sryder
|
d491c62c7c
|
Don't read from a per-map COLORMAP if it is too big.
Could this be changed to only read the first so many bytes?
|
2019-06-23 12:47:20 +01:00 |
|
Jaime Passos
|
75165ebb28
|
PNG support
|
2019-05-26 23:37:23 -03:00 |
|
Jaime Passos
|
6019cf64e8
|
Merge remote-tracking branch 'upstream/jimita-flats' into flats
|
2019-05-26 16:43:33 -03:00 |
|
Jaime Passos
|
5e19cacb39
|
Minor fixes
|
2019-05-26 16:22:33 -03:00 |
|
Nev3r
|
0d2e50bd26
|
Permit textures to use the "TEXTURE" tag in addition to "WALLTEXTURE".
It's pointless to make any distinctions anymore IMO, given flats can load them just fine now.
|
2019-05-26 12:02:43 +02:00 |
|
Jaime Passos
|
62547b2a49
|
Animations, better flat management.
|
2019-05-21 15:24:26 -03:00 |
|
Jaime Passos
|
83bef14a5a
|
Fix warnings
|
2019-05-21 11:03:53 -03:00 |
|
Jaime Passos
|
7ffb6bb09b
|
HOLD UP
|
2019-05-21 09:50:39 -03:00 |
|
Jaime Passos
|
775b64f540
|
Support for patches and textures to be used in place of sector flats
Still a work in progress.
|
2019-05-21 00:28:52 -03:00 |
|