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
18121 commits 1 branch 12 tags 205 MiB
Commit graph

186 commits

Author SHA1 Message Date
toaster
b4af07ffed Merge branch 'master' into new-menus 
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/v_video.c
#	src/y_inter.c
 2021-10-18 01:18:37 +01:00
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07: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
Jaime Ita Passos
7380ccde60 Fix unused variable warning when USE_APNG is not defined 2020-12-19 17:40:18 -03:00
GoldenTails
676f758d39 Add aPNG downscaling, and its associated consvar. 2020-11-19 13:45:04 -06:00
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
toaster
a43f88074e Fix the weird "Eggman is not a colour" print by fixing the code that overwrote your skin and colour willy-nilly, and then disabling it (it was a mistaken element of the port). 2020-09-22 19:44:13 +01:00
Sally Coolatta
bc868d8c60 m_misc compiles 2020-08-14 06:32:03 -04:00
Sally Coolatta
6ef0af4ba5 g_game and g_input now compile 2020-08-13 00:05:44 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes 
LOTS of stuff I changed to use arrays instead of constantly duplicated code
 2020-08-10 23:38:32 -04:00
Sally Coolatta
c96bd5f64a Many removals 
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
 2020-08-10 21:45:51 -04:00
Sally Coolatta
7ac6723e46 gamecontrol has another index for player num, instead of being duplicated for players 2-4 2020-08-10 20:08:32 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -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
GoldenTails
54901c3c15 Whose idea was it to make the aPNG speed 1/2x by default?! 2020-07-08 18:14:11 -05:00
SteelT
ecf0b38bbb Resolve m_misc.c and z_zone.c 2020-06-03 20:16:48 -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
Sally Coolatta
0dd19f4f50 Merge branch 'master' into new-menus 2020-05-16 04:37:44 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Alam Ed Arias
2a116ac847 Tested to be compile with Mingw64 9.1.0 
(cherry picked from commit 5a79a446dfc3632de3e27567afd65d9782510739)
 2020-05-11 18:43:24 -07:00
Sally Coolatta
b4f8d708a4 Merge branch 'master' into new-menus 2020-05-09 17:04:10 -04:00
Wolfy
5e4ec61d82 Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_cache.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_glob.h
#	src/hardware/hw_main.c
#	src/r_bsp.h
#	src/r_data.c
 2020-04-11 23:47:25 -05:00
James R
3fa22c508b Put screenshots, movies and replays under a "media" directory 2020-03-30 17:41:48 -07:00
James R
61be09e6bf Merge remote-tracking branch 'origin/master' into gifs-port 2020-03-28 21:00:39 -07:00
Sal
eb9144338a Merge branch 'logs-port' into 'master' 
2.2 directory structure and log files port

See merge request KartKrew/Kart!224
 2020-03-28 22:16:50 -04:00
Jaime Passos
21a3067936 Fix M_PathParts instead 
(cherry picked from commit 244f0b228fefb69fb59c1f7f70d4815c0388a634)
 2020-03-24 15:49:29 -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
c79ceca65e Forgot includes 
(cherry picked from commit 92dd9d20663c8c601053354326fd9412694e3078)
 2020-03-24 15:48:42 -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
d6c8306858 Fix this mistake 
(cherry picked from commit cc80cd77c531d23f88ae5f7ee417a453172fdc09)
 2020-03-24 15:38:33 -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
Jaime Passos
1a759a4904 GIF recording 
(cherry picked from commit d467d2b2295a9660631774b9edb29555cc5c30fe)
 2020-03-23 17:10:33 -07:00
James R
3c2adbb7d1 Fix whacky history 2020-03-23 17:08: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
2fb599661e Introducing pMasterPalette. 
Used instead of pLocalPalette when attempting to determine objective truths, such as "the colours of this gif without color profile modification" and "what indicies should this colormap remap to".

Also, made f_wipe.c's paldiv only get calculated once.

(cherry picked from commit d669a4e84a)
 2020-03-23 16:45:57 -07:00
toasterbabe
e8c37067ed Made PCX use cv_screenshot_colorprofile. 
Also, optimised gif headwrite's palette writing.

(cherry picked from commit 3cce495675)
 2020-03-23 16:36:21 -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
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
f51772b29d Fix M_Ftrim 
- Use '%f' instead of '%g' to avoid going scientific. Should also fix some
  compiler warnings.
- The trailing zero trimming code is now useful. It started on the terminating
  byte before and wouldn't have done anything with '%g' anyway.
- Use the absolute fractional value to avoid a sign.
 2020-02-17 19:38:14 -08:00