stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
7955 commits 172 branches 41 tags 280 MiB
Commit graph

7955 commits

This branch
This branch
All branches
Author SHA1 Message Date
lachwright
c201879d69 Add Metal's jet fume 2019-10-23 12:35:17 +08:00
James R
923f43f887 Move change viewpoint control checking so it doesn't take precedence 
Notably over chat.
 2019-10-22 21:32:12 -07:00
James R
5ac8a26814 Miscellaneous window de-focus options 
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
 2019-10-22 21:15:20 -07:00
James R
12540dca32 Make "Focus lost" HUD overlay optional 2019-10-22 20:30:05 -07:00
James R
43ca2c1b30 Support splitscreen PLAYERINFO and don't expose clients' IP addresses 2019-10-22 20:14:01 -07:00
James R
a24814c2fc Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-10-22 20:09:33 -07:00
James R
f0ee901160 Support adding to CV_FLOAT cvars with the Add command 2019-10-22 20:04:02 -07:00
James R
135619af8b Add a command to increment cvars 2019-10-22 20:03:45 -07:00
James R
602c66d173 Grab mouse on window focus 
Window focus does not necessarily imply mouse movement.
 2019-10-22 19:45:43 -07:00
James R
3ffa84a77b Replace ping command with a condensed and sorted version 2019-10-22 19:40:05 -07:00
James R
29a5999a44 "NEWPING" might as well be the only ping 2019-10-22 19:39:26 -07:00
James R
d62674c184 Clang warnings 2019-10-22 19:18:56 -07:00
toaster
386ac78600 Merge branch 'mace-place' into 'master' 
Make maces normally placeable in maps.

See merge request STJr/SRB2Internal!390
 2019-10-22 13:29:06 -04:00
Monster Iestyn
520deac658 remove last few specks of Windows CE code I missed years ago 2019-10-22 16:39:44 +01:00
Nev3r
dbd8e563b4 Merge branch 'soundex_tweak' into 'master' 
Tweak Line Special 414's behavior

See merge request STJr/SRB2Internal!382
 2019-10-22 05:31:22 -04:00
sphere
57a8af1557 Disable standalone hangable chains, since they're not a good mechanic. 2019-10-22 02:29:34 +02:00
James R
acd28c001e lmao I forgot the backside FOF 2019-10-21 14:44:16 -07:00
James R
ea0a0f4f3c Comment for insanity 2019-10-21 14:28:22 -07:00
James R
e2f2166d24 Fix hang due to comparison not working on at least GCC 9.1 
I have no idea what the fuck is going on here. k infinitely ascends. (Even
above integer restrictions when I made it UINT8.) I can only imagine some kind
of fuckery in the stack. Surely this is a compiler error.
 2019-10-21 14:20:29 -07:00
James R
8c5c2a7e4b Flatb 2019-10-21 12:42:04 -07:00
lachwright
3a3122e255 Add green flame sprites, state, and object 2019-10-21 16:22:20 +08:00
lachwright
d6411b9549 Add new ATZ gargoyle sprites 2019-10-21 13:43:02 +08:00
lachwright
c52ee364f5 Only allow landing in the melee ability mid-twinspin if jump or spin is held 2019-10-21 12:49:12 +08:00
James R
e15ffd2bc8 Optimize texture/patch/png/flat flat caching 
SIGSEGV in the case where you have a TEXTURES entry, but no texture or flat,
has been fixed.

Missing flats for now yield a HOM instead of REDFLR as well.

OpenGL also doesn't work yet. And I'm too tired for now to bother with it.
 2019-10-20 20:24:03 -07:00
lachwright
441aceb116 Add new dashmode colormap 2019-10-21 04:37:56 +08:00
toaster
9d425b21e2 Modify initial platform sink to be more natural, while still toeing the line between "forgiving" and "punishing". 2019-10-20 19:13:46 +01:00
lachwright
a2f0f61d75 Merge branch 'master' into linedef-153 2019-10-20 20:20:41 +08:00
MascaraSnake
57d29a9b65 Merge branch 'platterwrap' into 'master' 
Prevent wraparound on Level platter when there are less than 3 rows

See merge request STJr/SRB2Internal!383
 2019-10-20 06:45:05 -04:00
MascaraSnake
7c481744a4 Merge branch 'kartport_dedi' into 'master' 
Kart-port dedicated server Lua fix (round 2)

See merge request STJr/SRB2Internal!387
 2019-10-20 06:43:54 -04:00
MascaraSnake
41dd9c4f0a Merge branch 'flats-fixes-13102019' into 'master' 
Transparent flat fixes (Resolves #249)

Closes #249

See merge request STJr/SRB2Internal!384
 2019-10-20 06:42:17 -04:00
MascaraSnake
fcf05c728b Merge branch 'master' into object_tweaks 2019-10-20 12:34:49 +02:00
MascaraSnake
54847b1949 Merge branch 'mapthingtweaks' into 'master' 
Mapthing tweaks (object_tweaks division 1)

See merge request STJr/SRB2Internal!396
 2019-10-20 06:33:01 -04:00
MascaraSnake
0a321b96d3 Clarified description of "strong" bustable blocks in the ZB config 2019-10-20 12:28:30 +02:00
Steel Titanium
b219be6f5e
Remove level select restrictions in Multiplayer 2019-10-19 21:37:03 -04:00
MascaraSnake
1604e4d439 Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST 2019-10-19 22:20:48 +02:00
Monster Iestyn
9c36cf00d8 Merge branch 'fix-player-state-resynch' into 'master' 
Fix player state resynching

See merge request STJr/SRB2Internal!393
 2019-10-19 16:15:19 -04:00
James R
fc97ccd7d4 Fix item selection not returning to "Specify IPv4 Address" 2019-10-19 13:07:20 -07:00
James R
4a15e2d1d8 Fix "You must specify an IP address" message returning to title instead of MP menu 2019-10-19 13:01:06 -07:00
James R
dfdbc0afe3 Don't fade to character select from secret level select 2019-10-19 12:42:53 -07:00
James R
25d8b7d5ea Don't fade to Server Options 2019-10-19 12:25:02 -07:00
Steel Titanium
3e0a9cf742
Revert my old attempt of making the level music fade out before game over jingle 2019-10-19 14:36:30 -04:00
MascaraSnake
3f42834a98 Merge branch 'thinkerlists_oops' into 'master' 
Fixed a netgame crash that was caused by a closing brace being in the wrong place :v

See merge request STJr/SRB2Internal!395
 2019-10-19 13:34:28 -04:00
toaster
c8629c2aab Adjust hardcoded skin numbers for character-related events, to fit with the re-ordered skins. 2019-10-19 18:16:52 +01:00
toaster
bf761a26d6 * Implement fixes/tweaks as written on the gitlab. 
* `SPR2_NTAG` last vestiges removal.
    * Removed need for `getskinfromdescription()` by calculating it once, at Menu load, and storing in `description_t`.
    * Fixed nametag colour issues.
    * Support widescreen with nametags.

* Fix a metric SHITTON of compiler errors.
    * Redefining `x` and `y` within scope of previous `x` and `y` (`M_DrawSetupChoosePlayerMenu`)
    * GCC straight up will not let you cast a `const char*` to a `char` (`V_DrawNameTag`)
    * Redefining `lines` within the scope of the global.
    * Redefining `string` within the function-specific `string`.
    * It would be recommended for y'alls to turn ERRORMODE on!
 2019-10-19 18:15:54 +01:00
Louis-Antoine
88d239ac36 Set the player's name as soon as they enter the game 2019-10-19 17:09:18 +02:00
toaster
7e04cbbc16 Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2) 2019-10-19 16:01:04 +01:00
toaster
920736ac8b Grouped ports from object_tweaks. 
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
* Put diagonal blue spring in config.
 2019-10-19 15:57:01 +01:00
toaster
dfd6c5b9d2 Fix hw_light.c list (not gonna make an exe for this) 2019-10-19 15:50:16 +01:00
toaster
e549de392f Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters. 2019-10-19 14:46:14 +01:00
toaster
7f26b90113 Decrease drag on directionchar in waterslides on sphere's request. 2019-10-19 14:32:34 +01:00