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
Nev3r
e80e0b6007
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
2020-08-15 13:44:59 +02:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
7b4d84c3f3
Merge remote-tracking branch 'public/master'
2020-08-12 18:55:43 -04:00
SteelT
228f9e519a
Merge Makefile
2020-08-10 15:18:09 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04: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
Sally Coolatta
565786011f
Merge Makefile
2020-08-09 15:54:36 -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
Sally Coolatta
3d53adaa2b
Sliding HUD
...
- Split HUD stuff into k_hud.c/h
- V_SPLITSCREEN replaces the old function that sets V_SPLITSCREEN/V_HORZSCREEN flags system, and instead automatically moves it based on player number
- V_SLIDEIN makes HUD items slide in after the intro animation.
2020-07-26 05:47:53 -04: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
Sally Coolatta
2a7f79b800
Merge branch 'grand-pricks' into nametags
2020-06-04 17:21:36 -04:00
Sally Coolatta
f4c0011a76
Merge branch 'master' into grand-pricks
2020-06-04 14:41:56 -04:00
Sally Coolatta
120dc253af
Merge remote-tracking branch 'origin/iwantmychat' into nametags
2020-06-03 20:19:26 -04:00
Sally Coolatta
d336f24860
Move kart .o
2020-06-01 15:49:51 -04:00
Sally Coolatta
086ea73c2f
Merge branch 'master' into respawn-updates
2020-06-01 15:49:30 -04: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
Sally Coolatta
d062a35a3a
Huge respawn overhaul
...
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
2020-05-29 01:04:51 -04:00
Sally Coolatta
20b2dabae9
Merge branch 'pet-robo' into grand-pricks
2020-05-25 12:44:59 -04:00
Sally Coolatta
02605a5ace
Split bot code into multiple files & clean up
2020-05-24 15:08:10 -04:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
Jaime Passos
c69a4f9ced
Merge remote-tracking branch 'origin/next' into pictureformats
2020-05-15 01:34:54 -03:00
James R
94e77ba652
Rename hms123311.c to http-mserv.c
...
HMS lives on in our hearts!
(cherry picked from commit 8a006fef18
2020-05-14 17:28:55 -07:00
James R
8a006fef18
Rename hms123311.c to http-mserv.c
...
HMS lives on in our hearts!
2020-05-14 17:26:10 -07:00
