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
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
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
Nev3r
09ff071656
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
5a4eded7af
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
baeda5060c
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
1de7fcad8d
Resolve r_data.c colormap conflict
2019-01-07 15:29:37 -05:00
Nev3r
6acdc428f7
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
mazmazz
81352aece1
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
52b6810ee1
Remove log message
2018-12-24 20:33:59 -05:00
mazmazz
7c3dcd2bf9
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
mazmazz
732b9a66ca
Fix float comparison for colormap maskamt
2018-12-24 19:58:05 -05:00
Alam Ed Arias
facba6c04d
fix compiling for clang
2018-12-14 21:31:37 -05:00
Alam Ed Arias
261e1e623c
Clear float equal warnings
2018-12-14 20:34:06 -05:00
MonsterIestyn
d158d7e011
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Nev3r
34c472dfb7
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
623c7097f1
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
9f710ffbe1
Be gone ye old texture hack
2018-10-11 21:08:25 +01:00
