thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18590 commits 1 branch 12 tags 205 MiB
Commit graph

44 commits

Author SHA1 Message Date
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
GoldenTails
676f758d39 Add aPNG downscaling, and its associated consvar. 2020-11-19 13:45:04 -06:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
d27f16c4d5 A bunch of easy files (1-5 conflicts) 
g_state.h, hu_stuff.h, lua_hud.h, m_misc.h, p_polyobj.c, p_telept.c, r_draw.c, r_draw8.c, r_sky.c
 2020-08-05 14:34:17 -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
Louis-Antoine
fbfb9dc95c Create FIL_ConvertTextFileToBinary 2020-05-19 20:00:58 +02:00
James R
61be09e6bf Merge remote-tracking branch 'origin/master' into gifs-port 2020-03-28 21:00:39 -07:00
James R
b4f93fea8e Let an asbolute path work with -logfile 
(cherry picked from commit 5fbe77cdda7ec52bc2ca10ab9253df8dc56d2317)
 2020-03-24 15:49:08 -07:00
James R
45a2e22abc -logdir lets the user change the log directory 
(cherry picked from commit 457e986b7514c0e9fa921c1961344012443ac164)
 2020-03-24 15:49:07 -07:00
James R
6274b9fde1 ferror does not return errno, are you stupid? 
Use M_FileError to return the proper error description, or "end-of-file".

(cherry picked from commit 2f521f2eb18a79fd7e0a6aca2f2b7b6113042d6c)
 2020-03-24 15:48:42 -07:00
Steel Titanium
e9110b660c Better directory structure 
(cherry picked from commit 8ee0a9309b289a1a3d1a7260a44a43c776180686)

# Conflicts:
#	src/m_menu.c
#	src/m_menu.h
#	src/m_misc.h
 2020-03-24 15:36:44 -07:00
Jimita the Cat
9ded0d1770 dumb 
(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
 2020-03-23 17:03:35 -07:00
Jimita the Cat
a3732678e0 Add support for flashpals in screenshots 
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
 2020-03-23 17:03:34 -07:00
Jimita the Cat
d6493c9101 dumb 
(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
 2020-03-23 16:54:18 -07:00
Jimita the Cat
60624edc1a Add support for flashpals in screenshots 
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
 2020-03-23 16:54:17 -07:00
toasterbabe
7a14bbba82 Disable colour profile influence on screenshots and gifs if you want. 
(cherry picked from commit 8b46ee76ff)

# Conflicts:
#	src/m_menu.c
 2020-03-23 16:35:38 -07:00
toasterbabe
56ac088443 Screenshots now contain the palette you're actively looking at, as opposed to the palette the game/map has! This makes sense for colorblind users being able to store their precious memories, and it matches up with how gifs palettise. 
(cherry picked from commit 9d46ba281f)
 2020-03-23 16:34:59 -07:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
99ad30796c Trim the trailing zeros off floats for cvars 2020-01-20 23:14:26 -08:00
James R
0f4ef9a354 Put the word jumping code in functions 2020-01-08 12:58:19 -08:00
James R
1da751bdd3 Let an asbolute path work with -logfile 2019-12-23 17:40:43 -08:00
James R
aaf2ef21b3 -logdir lets the user change the log directory 2019-12-23 17:21:58 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Steel Titanium
dc9a09f837 Merge branch 'public_next' into 'master' 2019-11-18 15:39:41 -05:00
Steel Titanium
414bff33bf Better directory structure 2019-09-08 01:29:09 -04:00
Monster Iestyn
67392baae0 Merge branch 'public_next' 
# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-06-09 20:04:08 +01:00
mazmazz
81352aece1 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
c7b0df8172 Merge remote-tracking branch 'srb2public/next' 
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
 2018-11-07 16:15:14 -05:00
Monster Iestyn
277fd8daa8 Moved screenshot/movie consvar externs to m_misc.h 2018-10-11 19:38:11 +01:00
Monster Iestyn
41ae71db4a postponed PSP 2017-09-29 20:34:16 +01:00
Monster Iestyn
f4e535a64d Burned Dreamcast port at the stake 2017-09-29 18:19:34 +01:00
toasterbabe
8b46ee76ff Disable colour profile influence on screenshots and gifs if you want. 2017-04-20 18:59:27 +01:00
toasterbabe
9d46ba281f Screenshots now contain the palette you're actively looking at, as opposed to the palette the game/map has! This makes sense for colorblind users being able to store their precious memories, and it matches up with how gifs palettise. 2017-04-20 13:17:11 +01:00
Monster Iestyn
488c4071ba Moved screenshot/movie consvar externs to m_misc.h 2017-04-14 18:14:15 +01:00
Sryder
68d439a783 Merge branch 'upstream/next' into zarrotsu_vanillamerge 
# Conflicts:
#	src/Makefile
#	src/doomdef.h
#	src/hardware/hw_main.c
#	src/p_mobj.c
#	src/p_user.c
#	src/r_segs.c
#	src/sdl/i_video.c
#	src/win32/win_sys.c
 2017-02-17 20:14:55 +00:00
ZTsukei
580f909c6c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00
ZTsukei
e4a970f894 Starting from scratch. SRB2 v2.1.15 2016-07-06 00:10:19 -04:00
Monster Iestyn
69f556d40a Split AA trees code from m_misc.c/.h into m_aatree.c/.h 
Also updated any relevant project files that I can think of to include the new files, as well as the makefile of course. Some of the other project files haven't been touched in years so I'll leave those alone ...unless someone objects
 2016-06-05 21:29:40 +01:00
Inuyasha
f07585191b copyright dates/statements updated and such 
(no actual SLOC changes)
 2016-05-17 17:42:11 -07:00
Inuyasha
7c79bbc0b3 Proper overflow checking, applied to FOFs and midtex's too 
This fixes the annoying flickering when you pass by water, FOFs, tall grass, etc.
 2016-05-02 05:29:30 -07:00
Alam Ed Arias
2fed5d1270 SRB2 2.1.3 release 2014-03-18 13:56:54 -04:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00