Commit graph

7525 commits

Author SHA1 Message Date
Sally Coolatta
fa5fccffc5 Implement lives system
Lose a life & restart the current race if you place below the top half. Lose all of your lives, and you get kicked to the title screen.
2020-05-13 02:14:39 -04:00
Sally Coolatta
63797b35f7 Merge branch 'pet-robo' into grand-pricks 2020-05-12 22:40:02 -04:00
Sally Coolatta
1788d29263 Merge branch 'master' into pet-robo 2020-05-12 22:38:23 -04:00
Sal
40333bf158 Merge branch 'merge-12' into 'master'
Merge v1.2

See merge request KartKrew/Kart!262
2020-05-12 22:34:31 -04:00
Sally Coolatta
95a077b4dd C'mon git merge everything, not just most of it |:V 2020-05-12 03:16:35 -04:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
f903ca960d Not in modeattacking 2020-05-12 01:41:00 -04:00
Sally Coolatta
ccfc326885 Add to CMakeLists 2020-05-12 00:20:59 -04:00
Wolfy
a8529f0855 Update patch.kart hash 2020-05-11 22:31:38 -05:00
wolfs
4bfea852f8 Merge branch 'appveyor-shit' into 'next'
Fuck you Appveyor / Thank you Appveyor

See merge request KartKrew/Kart-Public!165
2020-05-11 22:43:44 -04:00
James R
2e42865655 Fucking shadowed declarations in hw_md2.c 2020-05-11 18:57:38 -07:00
James R
bd52a32eb6 Disable 64-bit Appveyor builds 2020-05-11 18:55:20 -07:00
James R
3e2c7f42a1 Name the archive like the EXE
(cherry picked from commit 4304fe91e65845e3887935de046876b6313af9c9)
2020-05-11 18:45:46 -07:00
James R
72c4eedd4f Windows is dumb so no colon
srb2win-jameds-appveyor-exename-b1d931d47.exe

(cherry picked from commit 70cf119a8402607116b2f8fbb79028a2de0e8d96)
2020-05-11 18:45:46 -07:00
James R
ae7eb4bd57 Check if this actually is a PR before using those variables
(cherry picked from commit e082553f6d3a90baf97e056ab6790ce136f502d0)
2020-05-11 18:45:45 -07:00
James R
9b6410e86f I promise I know what I'm doing
(cherry picked from commit 6337932190d68d6f825f4f5dd47a6f3655c88f16)
2020-05-11 18:45:45 -07:00
James R
6265bd53fb Use the pull request repo, branch and commit
srb2win-jameds:appveyor-exename-b1d931d47.exe
(cherry picked from commit ef2febe1e01bc7c93f30d2063bfd754b1a79dd3a)
2020-05-11 18:45:45 -07:00
James R
959674c533 Well I'm an idiot
(cherry picked from commit b1d931d471bcf2ec9a40f6e7e52518807c5fd14b)
2020-05-11 18:45:45 -07:00
James R
98d6708b29 Put the abbreviated commit hash in the EXENAME for AppVeyor
srb2win-master-a6d49eaaa.exe

(cherry picked from commit d3315ae03c57296bfb5a7f9f5959492bdb7de24c)
2020-05-11 18:45:44 -07:00
James R
15193cb2b3 Put branch name and commit hash in EXENAME for AppVeyor builds
srb2win-master-a6d49eaaa70be5f88c26623c7b4a2fa5a770341e.exe

(cherry picked from commit c3f42859882e6a1a789668d9b78d1310dd5e7312)
2020-05-11 18:45:44 -07:00
James R
069e3589c2 Use GCC 8.1 for x86_64
(cherry picked from commit 658b8dcfa95935bbaef92c15476ad57ecc96950f)
2020-05-11 18:45:43 -07:00
James R
32ef2ec1b6 Remove Direct Draw from AppVeyor config
(cherry picked from commit 945f50c2736ee64734dcc94f36ff7dff4085c8e2)
2020-05-11 18:45:42 -07:00
Alam Ed Arias
06448c15cf Appveyor: other way around, the Mingw32 is at 9.1
(cherry picked from commit 0c2b3002944b28cd823326fb5febc71fad120ca0)
2020-05-11 18:43:25 -07:00
Alam Ed Arias
85ae5251fc Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
(cherry picked from commit 33c0b825a7cdfd6538f388748dba334191fbb9ee)
2020-05-11 18:43:25 -07:00
Alam Ed Arias
ca22d7524e Makefile: GCC80 does not exist
(cherry picked from commit eacf89e309d555bda78ed69945a7d995e56a3292)
2020-05-11 18:43:25 -07: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
Alam Ed Arias
a3287a8913 Makefile: support GCC 9.1
(cherry picked from commit d5cc3ce48daf594fc64ecdbaeceb5c537cf5bf72)
2020-05-11 18:43:01 -07:00
Alam Ed Arias
c12fac04c1 Makefile: stop building with DWARF v2 debugging info
(cherry picked from commit 07f89fd6b5130b886ba20cf4e8a2f1022853fb14)
2020-05-11 18:43:01 -07:00
Wolfy
61a4e1e762 HWR_CreateBlendedTexture optimizations
By Hannu_Hanhi
2020-05-11 17:47:24 -05:00
wolfs
7bb51aabfd Merge branch 'default-manifest' into 'awful-mix'
Add a default manifest file.

See merge request SinnamonLat/Kart-Public!16
2020-05-10 02:08:19 -04:00
wolfs
ca39b3faef Merge branch 'fallback-refusal' into 'awful-mix'
Display refusal message if there is no HTTP source and internal downloads are disabled

See merge request SinnamonLat/Kart-Public!17
2020-05-10 02:07:59 -04:00
Sally Coolatta
2282fa7452 Adjust bot rubberbanding distance with game speed 2020-05-10 00:17:36 -04:00
Sally Coolatta
e2d95ae9c1 Fake results for bots that didn't get to finish in time 2020-05-09 23:08:11 -04:00
Sally Coolatta
8bb145e249 Use proper scoring system in GP 2020-05-09 22:33:10 -04:00
Sally Coolatta
c1e8cc108f Master Mode bots are functional 2020-05-09 22:32:56 -04:00
Sally Coolatta
22afa68651 Rivals system
You can input a predetermined list of rivals for each character, up to 3. In S_SKIN: `rivals = sonic,tails,knuckles`. Can support skin names from addons without throwing warnings.
2020-05-09 21:55:50 -04:00
Sally Coolatta
4ae81ff236 Add menu for selecting cup & other options 2020-05-09 20:03:14 -04:00
Sally Coolatta
06002beb65 Add cupheaders to g_game.c
Whoops
2020-05-09 18:42:00 -04:00
Sally Coolatta
cbac15f380 Cup definitions from new-menus 2020-05-09 17:36:36 -04:00
Wolfy
742bf3453b Update hash again 2020-05-09 10:52:23 -05:00
Wolfy
eed42360b0 Forgot to update date modified 2020-05-09 09:15:17 -05:00
ThatAwesomeGuy173
972d052c67 Display refusal message if there is no HTTP source and internal downloads are disabled 2020-05-09 06:06:21 -06:00
Wolfy
1134d87b5f Update patch.kart hash 2020-05-09 03:16:46 -05:00
Sally Coolatta
4a3262da41 Initial GP commit
Has a rudimentary option in the menu, which spawns the specific bots & spawns you on Green Hills in singleplayer.
2020-05-09 03:42:51 -04:00
Wolfy
18ee678a3a Minor credits updates 2020-05-09 01:17:10 -05:00
Steel Titanium
63104b78fa Add a default manifest file.
The tldr is that it fixes opengl not working on systems with broken drivers, which is usually older intel GPUs
2020-05-08 22:59:19 -04:00
Sally Coolatta
9429ae80e1 Only do this if you're the server :VVV 2020-05-07 22:19:32 -04:00
Sally Coolatta
efc8ce335c Rubberbanding spacing was reworked
Instead of the spacing being completely difficulty dependent (which would cause them not to rubberband to 1st place if they were any difficulty lower than 9), it's based on their difficulty & overall race standings & a little bit of port priority instead. This enables you to see a pesudo "rival" even when every bot is the same difficulty.
2020-05-07 04:07:13 -04:00
Sally Coolatta
d2172fc54b Bot amount & difficulty is now controlled by cvars 2020-05-07 02:37:06 -04:00
wolfs
026acc1f7f Merge branch 'large-server-list' into 'awful-mix'
Increase MAXNETNODES so the server list can be larger

See merge request SinnamonLat/Kart-Public!15
2020-05-06 02:57:28 -04:00