Jaime Passos
9248f12d55
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Jaime Passos
cc12496e9c
Optimize mipmaps
2019-12-08 03:23:37 -03:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
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
c6253bb6f9
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
Jaime Passos
05e5fa1637
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-11-12 18:26:51 -03:00
Jaime Passos
91a01be891
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-11 14:41:55 -03:00
Jaime Passos
408288255f
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-11-11 14:10:37 -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
a9e3e0c00e
Support OpenGL
2019-11-09 13:28:56 -03:00
Jaime Passos
3e7be585ca
WORK!!
2019-11-09 12:22:18 -03:00
Jaime Passos
3f1681e0b3
fix uninitialized pdata*
2019-11-09 02:09:10 -03:00
Jaime Passos
5e55a04f5f
minor tweaks
2019-11-09 01:50:47 -03:00
Jaime Passos
773f2efdd9
minor fixes
2019-11-09 01:45:00 -03:00
Jaime Passos
c7d0d7b1c2
Flats as walls textures support, WIP, doesn't support animations yet
2019-11-09 01:36:53 -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
fe60902df5
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -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
8057eeaaca
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03: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
725d0b4c44
still making things better
2019-09-08 21:37:24 -03:00
Jaime Passos
c7e01a558e
initial stuff
2019-09-08 18:44:40 -03:00
Jaime Passos
2863ede7bf
initial stuff
2019-09-08 18:27:35 -03: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
Monster Iestyn
d9ca8b45d3
Saving work so far, UNTESTED
...
# Conflicts:
# src/r_data.c
2019-06-23 17:51:36 +01:00
Sryder
8a778a4070
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
bb9b1b3b1f
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
bc254d9cf7
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
45922f80d1
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
39857a846a
PNG support
2019-05-26 23:37:23 -03:00
Jaime Passos
dfd8beae27
Merge remote-tracking branch 'upstream/jimita-flats' into flats
2019-05-26 16:43:33 -03:00
Jaime Passos
93f60267c1
Minor fixes
2019-05-26 16:22:33 -03:00
Nev3r
36036b6cfd
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
dbb1575a6d
Animations, better flat management.
2019-05-21 15:24:26 -03:00
Jaime Passos
869f1e4e8d
Fix warnings
2019-05-21 11:03:53 -03:00
Jaime Passos
35d6da159d
HOLD UP
2019-05-21 09:50:39 -03:00
Jaime Passos
714c997aac
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
Nev3r
a9110c0645
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
...
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
b60c66325c
Added a mobj-only list entry for mobj thinkers
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 23:29:20 +02:00
Nev3r
39ba20be6b
Basic multiple thinker list implementation
...
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00
mazmazz
7aa55f24f5
Resolve r_data.c colormap conflict
2019-01-07 15:29:37 -05:00
Nev3r
7d09149b04
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
mazmazz
075f28b7c8
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
mazmazz
c65f44e805
Remove log message
2018-12-24 20:33:59 -05:00
mazmazz
e9e5128754
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
mazmazz
58728ec358
Fix float comparison for colormap maskamt
2018-12-24 19:58:05 -05:00
Alam Ed Arias
15d0673685
fix compiling for clang
2018-12-14 21:31:37 -05:00
Alam Ed Arias
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
MonsterIestyn
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
Monster Iestyn
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Nev3r
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
c548aaa347
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
Monster Iestyn
c1d5c711a9
Be gone ye old texture hack
2018-10-11 21:08:25 +01:00
mazmazz
efe0af960d
Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS
2018-09-15 02:10:55 -04:00
mazmazz
6844ed37c5
Colormap overhaul: %d format size_t -> UINT32 fix
2018-09-15 01:50:33 -04:00
mazmazz
57959522e2
Colormap overhaul r_data: Mixed D+C fix
2018-09-15 00:49:03 -04:00
mazmazz
07af82aa84
Missed fog boolean -> integer
2018-09-13 12:18:53 -04:00