Commit graph

6813 commits

Author SHA1 Message Date
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
toaster
5653a72141 * Resolve compiling issues with logmessages.
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)

(cherry picked from commit 113568095a609c662e33e67f311c94e28be127d9)
2020-03-24 15:43:07 -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
Sally Cochenour
464e3273a9 Missing include 2020-03-22 21:16:55 -04:00
Sally Cochenour
a638054332 Bad whoopsie 2020-03-22 20:37:20 -04:00
Sal
82a39f6c85 Merge branch 'kill-whitespace' into 'master'
Kill CRLF and trailing whitespace

See merge request KartKrew/Kart!216
2020-03-22 20:31:08 -04:00
Sal
d64f77cf06 Merge branch 'welcome-to-errormode' into 'master'
abs on unsigned does nothing

See merge request KartKrew/Kart!220
2020-03-22 20:30:47 -04:00
Sal
fe9927fbd8 Merge branch 'targets' into 'master'
Break the Capsules

See merge request KartKrew/Kart!172
2020-03-22 20:30:20 -04:00
Sally Cochenour
53df47b4fe toaster suggestions 2020-03-22 20:29:58 -04:00
James R
c74cea6d5d abs on unsigned does nothing 2020-03-22 14:47:12 -07:00
James R
dda610fbd4 Merge remote-tracking branch 'origin/master' into kill-whitespace 2020-03-22 14:36:21 -07:00
Sally Cochenour
7f07fa9b2d Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00
Sally Cochenour
198b9770f7 Apply to any break the capsules, instead of only time attack 2020-03-22 16:14:53 -04:00
Sally Cochenour
8d91ff1e1c No time limit in capsules 2020-03-22 16:13:41 -04:00
Sally Cochenour
b18df427dd Break the Capsules ends when you lose bumpers 2020-03-22 16:07:25 -04:00
Sally Cochenour
601ab839f0 Set bumpers to 1 in Break the Capsules 2020-03-22 14:55:47 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sal
6e02982e7d Merge branch 'air-spark-experiment' into 'master'
Air spark experiment

See merge request KartKrew/Kart!217
2020-03-22 14:26:33 -04:00
Sal
7ce109249a Merge branch 'antigrav-waypoints' into 'master'
Fix antigrav respawn, no respawn flag, and remove spinout when respawning

See merge request KartKrew/Kart!213
2020-03-22 14:23:21 -04:00
Latapostrophe
80e04a2035 Use proper respawn check, don't cancel spinout, but prevent dropdashing when respawning with spinout 2020-03-22 11:32:55 +01:00
Sal
36f9bb4381 Merge branch 'waypoints' into 'master'
Waypoints Exist

See merge request KartKrew/Kart!215
2020-03-22 01:05:02 -04:00
Sally Cochenour
c75e3a025c Braces to avoid compile error
(Not sure why I never got this until now?)
2020-03-21 23:11:19 -04:00
Sally Cochenour
521c4662bf void out heap after done asserting, to fix an unused variable compile error I get 2020-03-21 23:09:05 -04:00
Sryder
4975cce3ac Just use an I_Assert on SpawnSPBRingTrail 2020-03-22 00:47:17 +00:00
Sryder
9dae62c2c6 Fix me being hyperdumb with copypaste error 2020-03-22 00:47:02 +00:00
Sryder
2be2277f4b Fix the merge confluct I SOMEHOW missed 2020-03-22 00:44:28 +00:00
James R
d46c6dc384 Kill trailing whitespace 2020-03-21 17:37:33 -07:00
James R
12a229285b Kill CRLF 2020-03-21 17:37:16 -07:00
Sryder
203aa0602e Use P_FindSpecialLineFromTag for MT_WAYPOINT, now that it works where we need it
This matches how MT_SPINMACEPOINT was changed
2020-03-22 00:25:48 +00:00
Sryder
5cd1296505 Include license/copyright headers on new files. 2020-03-22 00:16:32 +00:00
Sryder
da2f1fc972 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/k_kart.c
2020-03-21 23:27:55 +00:00
Sryder
e874af3e43 Very minor fix to WRONG WAY
More opaque waypoint markers for kartdebugwaypoints
Looks like whitespace got murdered in k_kart.c again
2020-03-21 23:24:04 +00:00
Sal
bda7dc9ddf Merge branch 'colors-yet-again' into 'master'
Another round of small color tweaks

See merge request KartKrew/Kart!208
2020-03-21 19:03:27 -04:00
Sal
9d35d0f5d8 Merge branch 'driftspark-update' into 'master'
Yellow drift sparks & new drift spark effects

See merge request KartKrew/Kart!211
2020-03-21 19:02:48 -04:00
Sal
cbfce16dcc Merge branch 'done-with-spikeballs' into 'master'
Slow down backwards spikeballs (again)

See merge request KartKrew/Kart!212
2020-03-21 18:49:02 -04:00
Sal
0cb5e5893c Merge branch 'objscalefixes' into 'master'
Minor map object scale fixes

See merge request KartKrew/Kart!206
2020-03-21 18:48:36 -04:00
Sally Cochenour
668f80a8ea Properly scale... 2020-03-21 18:47:44 -04:00
Sal
21f28b27f5 Merge branch 'oops' into 'master'
Fix compile error with camtilt

See merge request KartKrew/Kart!214
2020-03-21 18:45:19 -04:00
Sryder
738d1f1940 Make kartdebugwaypoints far more clear to use for the debugging lines
Fix memory reallocation issue that I don't think could be seen currently
2020-03-21 21:32:40 +00:00
James R
1dd95f5e3b gr_shearing doesn't exist in master! 2020-03-21 12:53:33 -07:00
Sryder
3d3b8b6bc6 Replace many cases of if else if statements with I_Asserts.
This is done specifically on static functions that aren't used as callbacks.
This is done to keep the code cleaner, and the I_Asserts get compiled out in Release builds.
Logic is left in the "public" functions to avoid crashes as a result of the modules.
2020-03-21 19:00:00 +00:00
Sal
68bec970a3 Merge branch 'viewpoint-text-toggle' into 'master'
Option to hide/show viewpoint text

See merge request KartKrew/Kart!209
2020-03-20 22:07:30 -04:00