James R
a5c035b4ce
Merge branch 'master' into next
2021-04-06 16:19:15 -07:00
James R
e9b305c0b0
Makefile: fix object file not depending on headers
...
BRUH MOMENT
2021-04-06 03:55:57 -07:00
Steel Titanium
85bd18eeec
Merge branch 'master' into next
2021-03-01 16:55:48 -05:00
James R
0bd0b98909
Fix dependency file trying to be made for SRB2.res and not for interface/blua/hardware files
2021-02-28 17:02:08 -08:00
James R
db219a6ff3
Makefile: add a SILENT flag
...
This makes it print nothing to stdout.
Also fixed some irregularities.
2021-02-18 07:24:20 -08:00
James R
5df0a1c9e6
Generate individual dependency files
...
This removes Makefile.depends. Instead, '.d' files are included from the 'dep'
directory. This speeds up building because dependencies for every file don't
need to be regenerated if only one changes.
As a bonus, dependencies also won't be generated if only clean type targets
are going to be run. Also added a 'distclean' target, which cleans both
objects and dependency files.
2021-02-18 06:23:18 -08:00
James R
396a4ae635
Makfile: don't print some messages twice
2021-02-18 06:23:12 -08:00
X.organic
5c9d9636b3
Fix MOBJCONSISTANCY and make it optional in DEBUGMODE
...
MOBJCONSISTANCY checks confined to gamestate GS_LEVEL. DEBUGMODE
no longer implicitly enables them, making it netgame-compatible.
2021-02-16 21:36:28 +01:00
James R
887f4a0919
Merge branch 'master' into next
2020-12-12 02:38:51 -08:00
GoldenTails
d673604b48
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
James R
4f39497feb
Merge branch 'master' into next
2020-11-22 15:23:12 -08:00
James R
cb203d9366
Merge remote-tracking branch 'origin/master' into no-dd-make
2020-11-22 14:14:43 -08:00
GoldenTails
b4c88e92d9
Add NOECHOFILENAMES, if people don't want logspam.
2020-11-21 22:21:18 -06:00
James R
cb1326b0eb
Remove Direct Draw from the Makefiles
...
MINGW/MINGW64 implies SDL.
2020-11-21 15:19:54 -08:00
GoldenTails
f49136136a
Echo filenames when compiling without ECHO=1
2020-11-19 15:17:56 -06:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Nev3r
f94d9825b4
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
James R
99a0a9a9eb
Merge remote-tracking branch 'origin/master' into next
2020-11-01 20:01:22 -08:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Hannu Hanhi
e0a09ceeae
Use SSE3 in 32-bit x86 binaries
2020-10-25 00:08:24 +03:00
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
GoldenTails
e97a5d6087
Fix gzip failing to compress SRB2's objdump on non-Windows.
2020-10-12 16:59:47 -05:00
Jaime Passos
e23929a899
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03: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
James R
d78befc713
Merge branch 'master' into next
2020-08-31 16:10:05 -07:00
James R
7cbc9add07
Kill NOHS
...
(cherry picked from commit a79316b375
2020-08-31 16:06:40 -07:00
James R
f013b73dd5
Merge remote-tracking branch 'origin/master' into next
2020-08-28 19:52:25 -07:00
James R
f52b66fdf5
Merge branch 'makefile-detect-system' into 'master'
...
Detect which system the Makefile is running on to compile for
See merge request STJr/SRB2!1123
2020-08-28 22:49:34 -04:00
James R
ec3dffbb94
Makefile: add WINDOWSHELL=1 for the Windows detect
2020-08-20 20:19:50 -07:00
James R
fd4ab28a84
Makefile: automatically detect system to compile for, if no system was specified
...
This should work for mingw and linux so far.
2020-08-18 18:01:59 -07:00
James R
ce98fc16bd
Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
2020-08-18 16:45:00 -07:00
Jaime Passos
7bc4af41ab
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
Nev3r
e80e0b6007
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
2020-08-15 13:44:59 +02:00
James R
f9e74e8ba2
Merge branch 'kill-cd-support' into 'next'
...
Kill CD support
See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
42dbdd8c4a
Merge branch 'http-mserv' into 'next'
...
HTTP Based Master Server + Multithreading
See merge request STJr/SRB2!940
2020-08-09 20:24:26 -04:00
Steel Titanium
913c07959e
Kill CD support
2020-08-07 17:06:19 -04:00
Nev3r
3854b56228
Merge branch 'next' into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
2020-07-29 13:55:14 +02:00
Steel Titanium
62c85ea4a5
WIP: Remove support for DOS
...
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55: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
James R
47719474ef
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-13 08:58:43 -07:00
James R
e09a430804
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
James R
84d9aa93c7
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-11 17:41:46 -07:00
Nev3r
ebe16a66d9
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_ceilng.c
# src/p_floor.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_polyobj.c
# src/p_saveg.c
# src/p_setup.c
# src/p_spec.c
# src/p_spec.h
# src/p_user.c
# src/r_bsp.c
# src/r_defs.h
2020-07-10 18:18:07 +02:00
Jaime Passos
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
Jaime Passos
9788afa820
Remove Software tricks
2020-07-06 01:26:56 -03:00
Jaime Passos
abc4f22a3e
Delete hw_glide.h
2020-07-06 00:27:34 -03:00
Hannu Hanhi
8ea66e3813
OpenGL draw call batching system
2020-06-07 21:20:52 +03:00
Hannu Hanhi
6961bba693
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
