James R
08348fcd43
Merge remote-tracking branch 'srb2/next'
2021-04-05 01:26:17 -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
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
1f082f15e6
Merge SRB2 master
2021-02-27 02:25:14 -05: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
Sally Coolatta
90ca38acb0
Store where the finish line beam should be displayed
...
Instead of figuring out where it should be every tick while it's visible, store where it'll be at the start of the map.
Also moved finish line beam into a new file, k_race.c/h, for any Race-specific code.
A few unused variables for sprint map support later too
2021-02-05 01:24:23 -05: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
Sally Coolatta
fc934b38e1
Merge public next
2020-11-10 15:32:48 -05: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
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04: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
James R
f7a4667bc3
Use STUN instead of curl to fetch the public IP address for Discord
...
RFC 5389 is a standard protocol that can be used for this instead of ip4.me.
I may have gone overboard on the CSPRNG... It was fun though.
2020-09-30 03:57:50 -07:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
James R
5c623f191f
Merge branch 'master' into next
2020-09-13 14:39:01 -07:00
James R
e4622cfeb3
Makefile: add WINDOWSHELL=1 for the Windows detect
...
(cherry picked from commit 6f51c68c7248d616ad16f66b72cfcc36b7c952f5)
2020-09-13 14:25:08 -07:00
James R
538c27f2fa
Makefile: automatically detect system to compile for, if no system was specified
...
This should work for mingw and linux so far.
(cherry picked from commit f92026f98b168f4556d50d3dde403ab6bfd97ff3)
2020-09-13 14:25:08 -07:00
James R
e415b4b475
Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
...
(cherry picked from commit 9495e6354fed1028c6fc502cc9d946cfdd0b7896)
2020-09-13 14:25:07 -07: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
Sally Coolatta
54c487feff
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
James R
a79316b375
Kill NOHS
2020-08-24 17:58:39 -07: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
Sally Coolatta
b5a378f850
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
632df264a3
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -04:00
Jaime Passos
7bc4af41ab
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
