Commit Graph

159 Commits

Author SHA1 Message Date
Jaime Passos f55b0f52ca Accidental missing (void) 2019-11-15 18:53:32 -03:00
Jaime Passos d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -03:00
Jaime Passos 245881ec55 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
Jaime Passos 3354169769 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
Jaime Passos 91a01be891 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
Jaime Passos 4e6513b583 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-11 14:05:03 -03:00
Jaime Passos 773f2efdd9 minor fixes 2019-11-09 01:45:00 -03:00
Jaime Passos ae838d4879 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-08 23:01:29 -03:00
James R ceb8d298c2 Fix misaligned pointers 2019-11-07 16:29:58 -08:00
Jaime Passos 5464b6ab28 Use doomtype.h types instead of libpng types 2019-10-29 00:15:33 -03:00
Jaime Passos 0a49340ae1 Fix warnings when NOPNG=1 2019-10-28 23:46:33 -03:00
Jaime Passos 94ab276508 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
Jaime Passos a22af36305 add r_patch.c 2019-10-28 15:28:42 -03:00
Jaime Passos 1a44159ce9 Update r_data.c 2019-10-28 14:36:19 -03:00
Jaime Passos 79e99dc471 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
Monster Iestyn 520deac658 remove last few specks of Windows CE code I missed years ago 2019-10-22 16:39:44 +01:00
James R e15ffd2bc8 Optimize texture/patch/png/flat flat caching
SIGSEGV in the case where you have a TEXTURES entry, but no texture or flat,
has been fixed.

Missing flats for now yield a HOM instead of REDFLR as well.

OpenGL also doesn't work yet. And I'm too tired for now to bother with it.
2019-10-20 20:24:03 -07:00
Jaime Passos 88d19a2d9c fix holey textures 2019-10-13 18:37:41 -03:00
Jaime Passos 5118f8589d Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03:00
Jaime Passos d9507d62f8 ignore TRANSPARENTPIXEL 2019-09-23 19:20:59 -03:00
Jaime Passos 61aa84d15a pixel alpha mistake 2019-09-23 18:27:43 -03:00
Jaime Passos 9c7b3f1d80 patch fixes 2019-09-23 18:25:53 -03:00
Jaime Passos 322a0b8c41 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 ef7e8c5d58 use byteptr.h macros 2019-09-19 22:40:23 -03:00
Jaime Passos a6831aff9c compile fix 2019-09-17 22:29:53 -03: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
Jaime Passos 6c37576bc0 Moved this macro 2019-09-12 16:03:44 -03: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 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
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
Jaime Passos eb1b6eedeb some adjusts 2019-09-10 16:54:40 -03:00
Jaime Passos f0788598c9 Better fades 2019-09-09 23:31:48 -03: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 ff1fa3f92b Implement all the other alpha blend styles 2019-09-08 13:21:00 -03:00
Jaime Passos 3cc2b76fb8 probably want to Z_Free this............... 2019-09-07 18:56:08 -03:00
Jaime Passos f461b76bb0 fix translucency 2019-09-07 16:54:26 -03:00
Jaime Passos d38ba4d88c define stuff idk 2019-09-06 19:41:29 -03:00
Jaime Passos 0cc553be5f Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
Jaime Passos f68652aa66 I 2019-08-18 14:16:48 -03:00
Alam Ed Arias f67f9405bc Merge remote-tracking branch 'origin/master' into flats-png 2019-07-24 19:07:36 -04:00
Alam Ed Arias 0eb6b24415 Merge commit '45922f80d1e35aadc9da6e20fa32fa78c1044dfd' into flats-png 2019-07-24 18:17:01 -04:00
Jonas Sauer 166f1fac66 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 e9978b2955 Merge branch 'master' into thinkerlists
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
2019-07-02 23:08:37 +02:00
Monster Iestyn 9913cc39a1 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 afa6afa593 something something memory leaks 2019-06-28 19:43:37 -03:00
Monster Iestyn 3a9ce483f5 Merge branch 'master' into next
# Conflicts:
#	src/r_data.c
2019-06-28 23:24:36 +01:00
Jaime Passos 8362710e50 Merge remote-tracking branch 'origin/flats' into flats-png 2019-06-25 16:04:24 -03:00
Jaime Passos 0af9e865f9 Delete R_CropFlat 2019-06-25 14:41:07 -03:00