stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-26 14:21:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
11099 commits 173 branches 41 tags 186 MiB
Commit graph

11099 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
6d539626c4 I forgot to add the dep directory 2021-02-28 16:14:54 -08:00
sphere
a679212c5e Merge branch 'udb-config-bruh' into 'master' 
Nice UDB config there, SRB2.

See merge request STJr/SRB2!1354
 2021-02-28 11:57:30 -05:00
James R
89e411c6ae Merge branch 'dependency-files' into 'master' 
Dependency files

See merge request STJr/SRB2!1407
 2021-02-27 05:38:13 -05:00
Jaime Ita Passos
2ca8efd7ee Revert accidental push 2021-02-25 20:17:27 -03:00
Jaime Ita Passos
70ebca2bf6 Update README 2021-02-25 19:49:37 -03:00
Jaime Ita Passos
5b1dc6ba33 [Meta] Change branding 2021-02-25 19:49:34 -03:00
James R
747c278bc2 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
3d32f3145c 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
3003c252d1 Makfile: don't print some messages twice 2021-02-18 06:23:12 -08:00
GoldenTails
0d1973075d Nice UDB config there, SRB2. 2020-12-24 03:22:08 -06:00
James R
b31c4db89d Remove trailing whitespace 2020-12-12 02:37:03 -08:00
James R
e4cf8ebcf5 Merge branch 'what-is-a-standard' 2020-12-10 11:23:53 -08:00
Nev3r
42ced125a1 Merge branch 'no-dd-make' into 'master' 
Remove Direct Draw from Makefile

See merge request STJr/SRB2!1263
 2020-11-29 05:29:21 -05:00
James R
f39300ac74 Merge branch 'master' into no-dd-make 2020-11-22 15:29:37 -08:00
James R
b059ed40c6 Merge remote-tracking branch 'origin/what-is-a-standard-2' 2020-11-22 15:19:39 -08:00
James R
b2a84a9376 Merge remote-tracking branch 'origin/master' into no-dd-make 2020-11-22 14:14:43 -08:00
James R
e17b4d0299 Merge branch 'echo-filenames' into 'master' 
Echo filenames when compiling without ECHO=1

See merge request STJr/SRB2!1260
 2020-11-22 17:11:03 -05:00
GoldenTails
e3c6d1cef3 Add NOECHOFILENAMES, if people don't want logspam. 2020-11-21 22:21:18 -06:00
James R
79bbb3fe46 Remove Direct Draw from the Makefiles 
MINGW/MINGW64 implies SDL.
 2020-11-21 15:19:54 -08:00
GoldenTails
8cfa21fb20 Echo filenames when compiling without ECHO=1 2020-11-19 15:17:56 -06:00
Nev3r
1a8ec39f6c Remove direct definition for D__USE_MINGW_ANSI_STDIO, as the latest standards consider this to be deprecated. 2020-11-13 11:33:27 +01:00
James R
56d2290778 Merge branch 'cmake-fullscreen-fix' into 'master' 
Cmake: fullscreen fix

See merge request STJr/SRB2!1226
 2020-11-01 22:57:27 -05:00
James R
f2e15fc4f1 Merge branch 'cmake-curl-internal-fix' into 'master' 
Fix compiling using cmake if internal libs is used

See merge request STJr/SRB2!1225
 2020-11-01 22:57:12 -05:00
James R
d7335469eb Merge branch 'master-use-sse3' into 'master' 
Use SSE3 in 32-bit x86 binaries

See merge request STJr/SRB2!1213
 2020-11-01 22:47:36 -05:00
Hannu Hanhi
54cc9db7a5 Fix CMake SSE3 flag 2020-10-31 18:04:44 +02:00
Steel Titanium
62b5b86ed4 CMake: Fix fullscreen toggle not working 
All because of a typo
 2020-10-31 00:59:51 -04:00
Steel Titanium
d406340b5d Fix compiling using cmake if internal libs is used 2020-10-30 23:37:34 -04:00
Hannu Hanhi
244c76250f Use SSE3 in 32-bit x86 binaries 2020-10-25 00:08:24 +03:00
James R
333d3a2576 Merge branch 'cmake-multithreading' into 'master' 
Add multithreading option for CMake

See merge request STJr/SRB2!1204
 2020-10-23 16:42:32 -04:00
GoldenTails
1e0beab254 Add i_threads.h too 2020-10-20 15:58:34 -05:00
GoldenTails
31c410656c Add multithreading option for CMake 2020-10-20 15:44:01 -05:00
James R
7952408c8e Merge branch 'fix-gzip-makefile-failure' into 'master' 
Fix gzip failing to compress SRB2's objdump on non-Windows.

See merge request STJr/SRB2!1191
 2020-10-14 03:11:26 -04:00
GoldenTails
94f6d0b002 Fix gzip failing to compress SRB2's objdump on non-Windows. 2020-10-12 16:59:47 -05:00
James R
17ce7d57c3 Merge branch 'update-228' into 'next' 
2.2.8 prep

See merge request STJr/SRB2!1170
 2020-10-03 01:45:06 -04:00
James R
fdc1de357b Update appveyor.yml version 2020-10-02 18:05:12 -07:00
James R
b1d59c6641 Merge branch 'picfmt-pngfix' into 'next' 
Fix uninitialized variable issue in patches with missing grAb chunks

See merge request STJr/SRB2!1171
 2020-10-02 20:24:10 -04:00
James R
27d96bb21c Merge branch 'fartification' into 'next' 
Prevent Canarivore gas from teleporting up walls

See merge request STJr/SRB2!1154
 2020-10-02 20:23:36 -04:00
James R
8beee3761e Merge branch 'windows-console-go-brrr' into 'next' 
Fix #178

Closes #178

See merge request STJr/SRB2!1112
 2020-10-02 20:23:20 -04:00
James R
c35c5ad568 Merge branch 'remove-renderer-notice' into 'next' 
Remove "The OpenGL renderer is incomplete" notice (closes #281)

Closes #281

See merge request STJr/SRB2!1169
 2020-10-02 20:22:38 -04:00
James R
a0759816e5 Merge branch 'load-graphics-after-startuppwads' into 'next' 
Fix graphics replacements not taking effect via -file

See merge request STJr/SRB2!1168
 2020-10-02 20:22:11 -04:00
Jaime Passos
ebf50aad44 Use leftoffset and topoffset, not loffs and toffs 2020-10-02 20:40:42 -03:00
James R
401508e9d4 Update Srb2win.rc 2020-10-02 16:11:39 -07:00
James R
c51a4c8fb1 Update version to 2.2.8 2020-10-02 16:10:21 -07:00
James R
1c6c51744c Update patch.pk3 2020-10-02 16:07:15 -07:00
Jaime Passos
aaa9cff6ac Fix PNG issue in OpenGL + optimize PNG sprite loading 2020-10-02 19:48:13 -03:00
James R
be4c5751f8 Revert "Warn when going to OpenGL from the menu" 
This reverts commit 569453ee93.

And one line from b6089ccdaf.
 2020-10-02 15:37:23 -07:00
James R
8a8e0ceda2 Move HU_LoadGraphics after startuppwads are loaded 
This is needed for graphics replacements to take effect.
 2020-10-02 11:54:58 -07:00
James R
304e4bb1f9 Merge branch 'netids-break-again-fuck-this' into 'next' 
Fix net ids broken AGAIN (closes #310)

Closes #310

See merge request STJr/SRB2!1166
 2020-10-01 23:13:05 -04:00
James R
61cae79bd4 Fix off by one 2020-10-01 16:55:17 -07:00
James R
1cfb1f673b Add wads from the -file parameter after netvars are registered 
This is so netvars registered by any lua scripts will load in the correct order.
 2020-10-01 16:50:31 -07:00