GoldenTails
|
8cfa21fb20
|
Echo filenames when compiling without ECHO=1
|
2020-11-19 15:17:56 -06:00 |
|
Hannu Hanhi
|
244c76250f
|
Use SSE3 in 32-bit x86 binaries
|
2020-10-25 00:08:24 +03:00 |
|
GoldenTails
|
94f6d0b002
|
Fix gzip failing to compress SRB2's objdump on non-Windows.
|
2020-10-12 16:59:47 -05:00 |
|
SteelT
|
a033f482be
|
Merge branch 'pictureformats' into 'next'
PNG conversion refactoring
See merge request STJr/SRB2!675
|
2020-09-10 15:58:18 -04:00 |
|
James R
|
b2226e95d6
|
Merge branch 'master' into next
|
2020-08-31 16:10:05 -07:00 |
|
James R
|
6c2370f894
|
Kill NOHS
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
|
2020-08-31 16:06:40 -07:00 |
|
James R
|
37c647c00e
|
Merge remote-tracking branch 'origin/master' into next
|
2020-08-28 19:52:25 -07:00 |
|
James R
|
8d9b16df8c
|
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
|
6f51c68c72
|
Makefile: add WINDOWSHELL=1 for the Windows detect
|
2020-08-20 20:19:50 -07:00 |
|
James R
|
f92026f98b
|
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
|
9495e6354f
|
Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
|
2020-08-18 16:45:00 -07:00 |
|
James R
|
a808294c0c
|
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
|
23f218117c
|
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
|
dff0e87e03
|
Kill CD support
|
2020-08-07 17:06:19 -04:00 |
|
Steel Titanium
|
0d48d4c833
|
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
|
ca060a4372
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-21 22:25:00 -03:00 |
|
James R
|
93615b07be
|
Merge remote-tracking branch 'origin/next' into http-mserv
|
2020-07-13 08:58:43 -07:00 |
|
James R
|
b9a24001d8
|
Merge remote-tracking branch 'origin/next' into remove-glide-2
|
2020-07-12 16:05:15 -07:00 |
|
James R
|
479bbeacbe
|
Merge remote-tracking branch 'origin/next' into http-mserv
|
2020-07-11 17:41:46 -07:00 |
|
Jaime Passos
|
7911deebf8
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-06 19:29:14 -03:00 |
|
Jaime Passos
|
4f6420274f
|
Remove Software tricks
|
2020-07-06 01:26:56 -03:00 |
|
Jaime Passos
|
abeedc4b65
|
Delete hw_glide.h
|
2020-07-06 00:27:34 -03:00 |
|
Hannu Hanhi
|
abe13651d0
|
OpenGL draw call batching system
|
2020-06-07 21:20:52 +03:00 |
|
Hannu Hanhi
|
da98ea242e
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
Jaime Passos
|
1a79f6246d
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-05-15 01:34:54 -03:00 |
|
James R
|
57c7df74d9
|
Rename hms123311.c to http-mserv.c
HMS lives on in our hearts!
(cherry picked from commit e8a2397deaacdd7dc6f80717755bc89161247cb5)
|
2020-05-14 17:28:55 -07:00 |
|
Steel Titanium
|
ff8987f745
|
Support for http downloads
(cherry picked from commit 6fcc06bf72cf3b95c30f04919e807c7aaacec68d)
(cherry picked just the libcurl stuff)
|
2020-05-13 17:25:52 -07:00 |
|
James R
|
06da1425b3
|
The big bad HTTP master server
Cvars:
http_masterserver is the url to the master server's API.
masterserver_token may be an authentication token.
|
2020-05-13 17:18:26 -07:00 |
|
James R
|
fe9b933b97
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2020-04-24 22:10:59 -07:00 |
|
Monster Iestyn
|
7a585e2498
|
Merge branch 'next' into demos-refactor
# Conflicts:
# src/g_game.c
(also update g_demo.c)
|
2020-03-20 17:48:31 +00:00 |
|
Monster Iestyn
|
1a14234088
|
update Makefile, CMakeLists.txt and MSVC project files
|
2020-03-19 20:13:39 +00:00 |
|
Louis-Antoine
|
e3cbdf8fab
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
fickleheart
|
b9d7b3e5c5
|
Merge remote-tracking branch 'upstream/master' into shaders-222
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
|
2020-03-14 12:52:15 -05:00 |
|
Monster Iestyn
|
37ecb47436
|
update Makefile, CMakeLists.txt and MSVC project files
|
2020-03-08 19:48:23 +00:00 |
|
Jaime Passos
|
26e367eb9b
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-03-07 20:43:16 -03:00 |
|
James R
|
7060083db5
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Jaime Passos
|
544d6acc51
|
Delete USE_PALETTED_TEXTURE again
|
2020-01-23 20:21:13 -03:00 |
|
Jaime Passos
|
f85476c723
|
Move texture stuff to its own file
|
2020-01-07 12:35:10 -03:00 |
|
Jaime Passos
|
a1af6b9134
|
Picture formats test
|
2020-01-06 18:22:23 -03:00 |
|
Steel Titanium
|
d415cd5c6d
|
Update copyright date on source files
|
2019-12-06 13:49:42 -05:00 |
|
Jaime Passos
|
245881ec55
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-12 21:38:02 -03:00 |
|
toaster
|
915e50a1e4
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
Merge seems fine, but won't compile for some reason.
|
2019-11-02 18:34:12 +00:00 |
|
Jaime Passos
|
a22af36305
|
add r_patch.c
|
2019-10-28 15:28:42 -03:00 |
|
sphere
|
bea7224ebf
|
Use zones.pk3 instead of zones.dta.
|
2019-09-29 05:31:50 +02:00 |
|
mazmazz
|
84c9633579
|
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
|
2019-08-04 21:33:13 -04:00 |
|
toaster
|
384dc0674e
|
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
This reverts commit 603d5805f7.
|
2019-08-04 12:03:57 +01:00 |
|
toaster
|
603d5805f7
|
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
|
2019-08-04 11:32:55 +01:00 |
|
mazmazz
|
5b0f7d2850
|
Merge branch 'master' into musicplus-sdlmixerx
|
2019-06-29 19:31:01 -04:00 |
|
mazmazz
|
dc0a92ea62
|
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
|
2019-06-29 17:51:30 -04:00 |
|
Steel Titanium
|
fe7b041346
|
Merge branch 'public-notpublic-libopenmpt' into 'master'
libopenmpt support
See merge request STJr/SRB2Internal!229
|
2019-06-21 17:03:53 -04:00 |
|