734b7008c4
Merge branch 'democam' into 'master'
...
If I were a bad Democam, I wouldn't be sittin' here discussin' it with ya now would I?!
See merge request KartKrew/Kart!48
2018-10-19 15:50:28 -04:00
4994e9749f
Merge branch 'no-spectate-griefing' into 'master'
...
Prevent spectate griefing
See merge request KartKrew/Kart!43
2018-10-19 15:50:18 -04:00
adb2fad43c
Merge branch 'sp_fixes' into 'master'
...
Singleplayer fixes (no, not record attack, the *other* one)
See merge request KartKrew/Kart!46
2018-10-19 15:50:06 -04:00
ab4bf563e0
Merge branch 'sweet-new-kicks' into 'master'
...
Sweet new kicks
See merge request KartKrew/Kart!39
2018-10-19 15:49:51 -04:00
d6cf424aed
Merge branch 'unlock-hard' into 'master'
...
Hard Mode is an unlockable
See merge request KartKrew/Kart!40
2018-10-19 15:49:32 -04:00
524ab75a6a
Merge branch 'remove-prints' into 'master'
...
Remove most gameplay prints
See merge request KartKrew/Kart!42
2018-10-19 15:49:01 -04:00
c8cd84ca34
No more vanilla democam, for real
2018-10-17 19:10:23 -04:00
9f05e14c99
Merge branch 'master' into democam
2018-10-17 18:17:42 -04:00
1ca823f981
<
2018-10-17 13:38:31 -04:00
ce443712b2
Some token efforts to make singleplayer mode (accessible only via `-warp` and `map mapxx -force`) not COMPLETELY broken.
...
* Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now).
* Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only.
* Made retries cause a mapchange, per the above.
* Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 13:40:17 +01:00
9047780e29
Prevent point grief
...
(Needs tested)
2018-10-16 20:56:04 -04:00
1f1ba26aa7
Merge branch 'fix-nextlevel' into 'master'
...
Fix "advancemap next" going to GHZ at the end of a cup
See merge request KartKrew/Kart!44
2018-10-16 18:08:04 -04:00
c9b0786a3b
Merge branch 'master' into fix-nextlevel
2018-10-16 17:05:47 -04:00
362cbeb6b5
Merge branch 'master' into no-spectate-griefing
2018-10-16 16:38:35 -04:00
bcc1911672
Merge branch 'nextmerge_plus_rain' into 'master'
...
Next-merge plus rain
See merge request KartKrew/Kart!41
2018-10-16 16:36:18 -04:00
ae7c4c44fa
Merge branch 'engine-tweak' into 'master'
...
Engine tune-up
See merge request KartKrew/Kart!45
2018-10-16 15:46:15 -04:00
a919260fd2
Default sound channels
...
Now that we figured out that the sound cut-outs were due to a race condition and not this option, I feel content putting it with these other engine tweaks.
2018-10-16 13:26:03 -04:00
b23a798978
1 minor, non-engine related change I wanted to make while I was at it:
...
Minor priority change to two voice lines; the "passing someone" line has the same priority as every other line, and gave it's boosted priority to the way more gameplay-important "hit 'em" line.
2018-10-16 12:48:46 -04:00
5701fe8a51
Give engines SF_TOTALLYSINGLE, and bug-fix it so that it can work like a flag
...
Sryder's request
2018-10-16 12:30:47 -04:00
e24cbb2c86
== --> >=
2018-10-16 12:23:05 -04:00
496e0df9d0
Smoother
...
NOW this is good enough to ship
2018-10-15 23:13:59 -04:00
8024ad74b5
Quick fix for banana cheat not showing all unlockables
...
Plus, this is generally better, as a mod could let you unlock stuff "out-of-order"
2018-10-15 22:02:10 -04:00
d158b3848e
Fix the earlier attempt at patching over this
2018-10-15 19:05:23 -04:00
01c48c88d0
Prevent spectate griefing
...
If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
2018-10-15 18:41:34 -04:00
d89fb8fcf7
remove all hit msgs & cv_hazardlog
2018-10-15 17:40:25 -04:00
6098a36bfe
More sensible `drawdist_precip_cons_t` maximum (slightly more conservative than Sryder's suggestion)
2018-10-14 23:13:11 +01:00
b81da3f000
restore
2018-10-14 17:54:18 -04:00
e23da397e4
Remove most gameplay prints
...
A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 17:45:28 -04:00
880e4c0631
Final weather stuff.
...
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
2018-10-14 22:32:34 +01:00
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
fe2af34ee5
Merge branch 'master' into next
2018-10-14 20:49:35 +01:00
423403eab5
Merge branch 'sound-handle-fix' into 'master'
...
Handle fix for SDL Mixer
See merge request STJr/SRB2!301
2018-10-14 15:46:25 -04:00
b720cb10dc
Merge branch 'pris_accurate-gif-delay' into 'master'
...
More accurate GIF delay
See merge request STJr/SRB2!276
2018-10-14 15:44:33 -04:00
b2f196d418
Merge branch 'no-doubling-texture-heights-plz-backport' into 'next'
...
No doubling texture heights plz
See merge request STJr/SRB2!296
2018-10-14 15:43:57 -04:00
cc7d9509f2
Merge branch 'mi-a-bit-of-cleanup-backport' into 'master'
...
MI's unimportant code cleanup
See merge request STJr/SRB2!295
2018-10-14 15:43:32 -04:00
3886888b30
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
b01643e043
Fix to itembar visual length problem
2018-10-13 23:38:29 +01:00
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
001e2aa42c
Hard Mode is an unlockable
...
Unlocks at 30 emblems, or 100 matches played
2018-10-13 17:54:53 -04:00
c4d1b80e97
Engine tweak
2018-10-13 17:07:30 -04:00
c1d5c711a9
Be gone ye old texture hack
2018-10-11 21:08:25 +01:00
9c464742b7
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
ef78c942f7
Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore)
2018-10-11 20:00:34 +01:00
49c5a6f7e4
Remove unused "runcount" variable from p_local.h
2018-10-11 20:00:23 +01:00
91b2f5e570
"t" is not needed to take out fencepost cases from viewangletox
2018-10-11 20:00:05 +01:00
07dd527e7e
Removed unused function prototypes in d_main.h
...
Also corrected what appears to be a typo in some comments above?
2018-10-11 19:59:47 +01:00
61a29bed85
Remove unused sscount variable
...
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
2018-10-11 19:59:26 +01:00
a4419abfdc
debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else
2018-10-11 19:59:09 +01:00
005bb7a5e0
para
2018-10-10 17:46:23 -04:00
da68d40760
Removed bumping
...
K_KartBouncing is so flaky, I have no idea why it refuses to work.
2018-10-10 17:31:09 -04:00
Sal