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
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
Sally Coolatta
249fff87ad
Merge branch 'new-cars-movie' into colorize-tweak
2020-05-12 22:46:46 -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
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f5d931cc
Skincolor code cleanup
...
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04: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
wolfs
4a264ffba9
Merge branch 'http-downloads' into 'awful-mix'
...
Support for http downloads
See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Steel Titanium
5e0eca9fe9
Support for http downloads
2020-04-07 18:22:29 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
James R
46ac563eaf
Implement big bad parties (splitscreen with network players)
...
Use the 'invite' command to invite another player to your party.
If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.
Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
2020-02-23 23:20:20 -08:00
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
James R
03b3d61fd1
Add TESTERS build flag to Makefile
2019-09-27 19:21:18 -07:00
TehRealSalt
38bb44e732
Separate into k_pwrlv.c, add defines to reduce amount of magic numbers
2019-09-23 08:26:42 -04:00
TehRealSalt
1ef09699d1
Functional gameplay
...
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score
Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
TehRealSalt
cd65381abc
Add another file to handle Kart item collision functions, now items can damage anything with MF_SHOOTABLE
...
Now this code won't make me pull out my hair. Could possibly be enhanced by using a function or define to handle the big copy-pasted tmthing/thing switch blocks in p_map, but for now I'm way happier.
As a result, Battle capsules are now destructible.
2019-09-15 17:25:33 -04:00
James R
9579f6ea9e
Add font system to Makefile and Visual Studio project files
2019-06-26 16:33:59 -07:00
Sryder
e937e35a78
Split pathfinding itself into its own module.
2019-06-12 23:43:55 +01:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Sryder
31d76596c0
Binary Heap Implementation
...
Currently untested.
2019-06-08 21:46:23 +01:00
Sryder
43936013f7
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/d_netcmd.h
# src/k_kart.c
# src/p_setup.c
2019-05-25 12:09:47 +01:00
TehRealSalt
da7e79ac83
Adjust file loading
...
Many files converted to pk3, and we now have a distinct IWAD
2019-05-12 20:58:26 -04:00
Jaime Passos
08efec4cf3
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 18:23:40 -03:00
wolfy852
963cbf4671
Merge branch 'next' into md3-vanilla-kart
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
Jaime Passos
35459caea7
md3-vanilla
2019-03-18 18:34:20 -03:00
wolfy852
2dc5dde769
Merge remote-tracking branch 'remotes/origin/master' into waypoints
...
# Conflicts:
# src/k_kart.c
2019-03-08 12:24:03 -06:00
wolfs
8a6f4b6405
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
james
ad8e7d8c3c
Support aPNG in new versions of libpng
...
A known issue: iTXt cannot be written (yet). I may do something about that.
For now, this is likely good enough. Who cares about the extra text anyway?
2019-02-10 23:52:02 -08:00
Sryder
a72630942d
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/p_mobj.c
2019-02-01 17:29:17 +00:00
mazmazz
aae6eb945d
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
TehRealSalt
ab76725038
Merge remote-tracking branch 'master' into next
2019-01-08 16:29:14 -05:00
mazmazz
3f2208bda2
Add MD2/MD3 files to makefile
2019-01-07 04:21:46 -05:00
wolfy852
934b199705
Compile flag for DEVELOP
2019-01-06 20:47:13 -06:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
deec4550d3
Rename M5 to ARCHOPTS; allow override by command line
2018-12-29 21:55:35 -05:00
mazmazz
44d2340a5b
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
2018-12-29 21:14:50 -05:00
Steel Titanium
f61c8fa279
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
