Eidolon
a4d304a1f5
Update copyright years to 2025
2025-02-13 15:32:26 -06:00
Sally Coolatta
7dfa597c7d
SRB2 -> DRRR copyright in src, acs, android folder
...
Be consistent with toaster's recent changes to copyright
2024-04-05 02:08:23 -04:00
Eidolon
dde6ca0dac
Remove all gcc pragma interface
...
GCC docs say these are not only obsolete but counter-productive for
their intended use case since GCC 2.7.2.
https://gcc.gnu.org/onlinedocs/gcc-13.2.0/gcc/C_002b_002b-Interface.html
2024-01-02 13:38:55 -06:00
Eidolon
be021baa02
Add extern "C" in C++ to all headers
2022-12-30 19:26:16 -06:00
James R
b5310a1f68
Add typedef.h
...
All typedefs for structs that were present in other header
files have been moved to here. (Except node_t because the
renderer and netcode both define node_t LOL.)
2022-11-27 17:21:40 -08:00
SteelT
c64f36309a
Support reading PICTURE/MINIMAP/ENCORE/TWEAKMAP lumps from a map resource
...
This supersedes the header-based method of fetching those lumps.
2022-09-12 17:29:15 -04:00
Sally Coolatta
b5334e6b42
Move follower code to its own file
2022-05-23 00:23:46 -04:00
toaster
60f08f2380
Defines per Sal request
2022-01-04 23:02:09 +00:00
toaster
40cbc30bff
Mammoth commit, sorry.
...
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.
Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.
If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
toaster
99a764dbc0
Loadbar plus.
...
* Resolves #145 .
* Increased granularity, to seperate out texture loading and sprite loading from other render structure initialisation.
* Shows small loading string in DEVELOP builds, to show where we can optimise loading times when we're polishing.
* Clean up con_refresh/startup, which got split into two variables in the merge by mistake.
2021-03-28 20:16:47 +01:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
9f869ec466
Merge r_data.c/h
2020-08-06 19:20:51 -04:00
Jaime Passos
10189ecdc0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-21 22:25:00 -03:00
Nev3r
d57d2959e0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-12 14:59:38 +02:00
Latapostrophe
6ac63cca7a
Merge branch 'v2-master' into followme-internal
2020-06-02 22:21:16 +02:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Jaime Passos
1b81e81c56
Attempt to properly match Software texture blending
...
without messing with the original ASTBlendPixel function
2020-05-16 13:51:10 -03:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Latapostrophe
766f7f035f
Let followers change colour separatly from players
2020-05-04 18:08:41 +02:00
MascaraSnake
c1dff185bf
Add enums to encapsulate the textmap colormap settings
2020-04-18 17:15:25 +02:00
Wolfy
5e4ec61d82
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
Jaime Passos
f106ba7ac4
Fix color LUT using the wrong palette
...
(cherry picked from commit 636093a59ddd95b25d79c4ebff51dc6412de1956)
2020-03-23 17:11:13 -07:00
Jaime Passos
1a759a4904
GIF recording
...
(cherry picked from commit d467d2b2295a9660631774b9edb29555cc5c30fe)
2020-03-23 17:10:33 -07:00
MascaraSnake
79852f0ec0
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
MascaraSnake
cbcabfd925
Merge branch 'udmf-next' into udmf-colormaps
2020-03-15 09:58:39 +01:00
MascaraSnake
ffb8928141
Add UDMF colormap fields
2020-03-15 09:55:57 +01:00
Jaime Passos
81a57d5fac
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Jaime Passos
b0ce2e088f
Merge remote-tracking branch 'origin/next' into pictureformats
2020-02-19 02:25:36 -03:00
MascaraSnake
4c4596a45f
Clean up the mess that is extracolormap_t::fog
2020-02-16 20:19:24 +01:00
Jaime Passos
e1ee02c308
Fix color LUT using the wrong palette
2020-01-27 13:55:13 -03:00
Jaime Passos
96340ac80c
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
James R
cb9db74044
Merge branch 'gl_gifs' into 'master'
...
OpenGL GIF movie recording
See merge request STJr/SRB2!549
2019-12-24 14:44:44 -05:00
Jaime Passos
740f095219
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-12 01:39:46 -03:00
Jaime Passos
3c9cc53185
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-12-11 21:53:47 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Jaime Passos
c2aab97d10
fix conflict
2019-11-12 00:23:26 +01:00
Jaime Passos
e32238f0b5
GIF recording
2019-11-10 00:21:48 -03:00
Jaime Passos
486df5ea7a
Flats as walls textures support, WIP, doesn't support animations yet
2019-11-09 01:36:53 -03:00
Jaime Passos
1c46be78af
add r_patch.c
2019-10-28 15:28:42 -03:00
Jaime Passos
116fb2639e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
Jaime Passos
0881c8542a
remove duplicate NearestColor prototype
2019-10-13 19:45:35 -03:00
Jaime Passos
08c3210e52
fix holey textures
2019-10-13 18:37:41 -03:00
Jaime Passos
e2ce3988fb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -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