James R
3fa22c508b
Put screenshots, movies and replays under a "media" directory
2020-03-30 17:41:48 -07:00
Sal
860885e2b9
Merge branch 'new-item-sprites' into 'master'
...
Add new item box sprites
See merge request KartKrew/Kart!229
2020-03-30 12:34:52 -04:00
Sally Cochenour
69a67376b3
Oni's suggestions
...
- Only look for players who can pick up the item. Serves as a subtle tell for other players holding onto items, and lets you see the canon color more often
- Held eggman item uses black instead of player color
- Fix karma items not animating
2020-03-30 07:43:22 -04:00
Sally Cochenour
266ad99374
Add new item sprites
2020-03-30 06:57:42 -04:00
Sally Cochenour
896f752d94
Fix the compile errors I got
...
- void out link variable in non-unix to prevent unused variable error
- change n's type to size_t from int to prevent unsigned signed comparison
2020-03-29 08:39:15 -04:00
Sal
f63b321eb2
Merge branch 'spb-waypoints' into 'master'
...
Dangerous SPB
See merge request KartKrew/Kart!227
2020-03-29 07:58:08 -04:00
Sal
7d1a7b0768
Merge branch '2.2-frames' into 'master'
...
Use the 2.2 frame characters
See merge request KartKrew/Kart!228
2020-03-29 07:34:09 -04:00
Sal
f8905982dc
Merge branch 'gifs-port' into 'master'
...
OpenGL GIF/Flashpal/Color Profile port
See merge request KartKrew/Kart!223
2020-03-29 07:33:48 -04:00
James R
61be09e6bf
Merge remote-tracking branch 'origin/master' into gifs-port
2020-03-28 21:00:39 -07:00
James R
1b6256bd89
Use the 2.2 frame characters
2020-03-28 20:57:27 -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
Latapostrophe
8960152a7c
Merge branch 'v2-master' into spb-waypoints
2020-03-28 15:12:38 +01:00
Latapostrophe
67f7fe2cc5
Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master
2020-03-28 15:11:28 +01:00
Sryder
26646e57e3
Merge branch 'flame-visual' into 'master'
...
Firework frames for fire shield
See merge request KartKrew/Kart!226
2020-03-28 08:10:16 -04:00
Sally Cochenour
9a8e3aecd9
Fix papersprite appearing on wrong frames
2020-03-28 06:19:25 -04:00
Sally Cochenour
bee6bbf619
Firework frames for fire shield
2020-03-28 03:56:39 -04:00
Sal
5dad8d125a
Merge branch 'horizon-line-update' into 'master'
...
Horizon line apply to FOFs backport
See merge request KartKrew/Kart!225
2020-03-28 00:28:37 -04:00
Sal
683e905ff1
Merge branch 'new-items' into 'master'
...
New items
See merge request KartKrew/Kart!165
2020-03-28 00:27:40 -04:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00
Sally Cochenour
2ca00cf2e9
Try to prevent bubble from going out of bounds
2020-03-28 00:21:41 -04:00
Sally Cochenour
d1580a5b42
More Flame Shield visuals
2020-03-26 08:48:02 -04:00
Sally Cochenour
8a3c7ad2fb
Add fire trail to flame shield
2020-03-26 03:13:49 -04:00
Sally Cochenour
7ec398e579
Slow down animation speed, fix meter bugs
2020-03-26 03:13:10 -04:00
Sally Cochenour
bf221c7afa
Another bugfix for hyu stuff
2020-03-26 01:16:04 -04:00
Sally Cochenour
4ddf1e4280
Don't allow k_flamedash to damage without flame shield
2020-03-26 01:14:57 -04:00
Sally Cochenour
b6c282ec12
Move Eggman item code to k_collide
2020-03-26 00:47:30 -04:00
Sally Cochenour
985aa44c95
Flame shield destroys items while being used
2020-03-26 00:47:03 -04:00
Sally Cochenour
6333dc4737
Thrust slightly when used in the air
2020-03-26 00:07:03 -04:00
Sally Cochenour
46209a96cf
Double leniency period
2020-03-25 23:52:45 -04:00
Sally Cochenour
81fa5d7f51
Start on new flame shield dash visuals
2020-03-25 23:49:39 -04:00
Sally Cochenour
505b0176c0
Horizon line apply to FOFs backport
2020-03-25 22:30:52 -04:00
Latapostrophe
6d0513aa9a
Fix conflict
2020-03-25 23:31:53 +01:00
Latapostrophe
5a6f5591ca
Merge branch 'master' into spb-waypoints
2020-03-25 23:30:18 +01:00
Latapostrophe
7473e4ee68
Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master
2020-03-25 23:29:40 +01:00
Sally Cochenour
14fdc8a90a
Savegame is a stupid term for this
2020-03-25 05:36:46 -04:00
Sal
dc9ce7bc20
Merge branch 'power-level-tweak' into 'master'
...
Power level tweak
See merge request KartKrew/Kart!219
2020-03-25 04:06:30 -04:00
Sally Cochenour
0051655c62
Merge branch 'master' into power-level-tweak
2020-03-25 02:04:53 -04:00
Jaime Passos
21a3067936
Fix M_PathParts instead
...
(cherry picked from commit 244f0b228fefb69fb59c1f7f70d4815c0388a634)
2020-03-24 15:49:29 -07:00
Jaime Passos
f74adb0ad9
Fix logfiles crashing Windoze
...
(cherry picked from commit 3bb7fd4cbf2bb92f5548cafad00b80cb366395a4)
2020-03-24 15:49:29 -07:00
James R
7ef8e81713
Correct usage of logdir
...
(cherry picked from commit b7b4945c36fb95f406a365d64f109cfc83ad4d63)
2020-03-24 15:49:09 -07:00
James R
d1de8cc2eb
Overwrite an already existing symlink
...
(cherry picked from commit f2c2836301d4dc59242d09f08a5473341c4d692c)
2020-03-24 15:49:08 -07:00
James R
10a9a05cd8
symlink latest-log.txt on nix, copy to the real log file everywhere else
...
(cherry picked from commit 25525a6aae84581ac03ca3089950ad4ff25b8512)
2020-03-24 15:49:08 -07:00
James R
294dfbacc5
Create directories from -logfile too
...
(cherry picked from commit 98cb238d36e0f85d9d4b4d2cff59c720e1630bdd)
2020-03-24 15:49:08 -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
599452af7b
Change default log filename to not use a space
...
bleh
(cherry picked from commit c285000c5668ab82545ec9ee4989aabf65e2585e)
2020-03-24 15:49:07 -07:00
James R
ccde660cdf
-logfile to let the user change the log file name
...
(cherry picked from commit d9d13764e6840e036c095c6d87838a4dfede80f4)
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
toaster
f400d33947
Mark new-style log names as loaded.
...
(cherry picked from commit c36123aa5687c5151aad98fd1941412f7407ae52)
2020-03-24 15:46:04 -07:00
