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

6427 commits

Author SHA1 Message Date
MascaraSnake
801e83aef6 Merge branch 'use-zones-pk3' into 'master' 
Use zones.pk3 instead of zones.dta.

See merge request STJr/SRB2Internal!352
 2019-10-26 15:33:13 -04:00
MascaraSnake
9e9e6a8f8f Merge branch 'metalstuff' into 'master' 
Metal Sonic's jet fume

See merge request STJr/SRB2Internal!413
 2019-10-26 14:52:04 -04:00
mazmazz
26cb75e961 Fix MIDI not being disabled when non-native 2019-10-26 12:09:27 -04:00
lachwright
e89948ce71 Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
MascaraSnake
92be187731 Merge branch 'master' into knuxstuff 2019-10-26 08:09:13 +02:00
James R
634292a5fc Differing signedness comparison 2019-10-25 21:44:34 -07:00
James R
64e7708832 I say damn you massive initializer! 2019-10-25 21:36:10 -07:00
mazmazz
c7c72a4892 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
lachwright
6c9ad67c84 Fix pointer typo (whoops) 2019-10-26 08:34:38 +08:00
lachwright
aa34f74f75 Remove imtermediary state transitions 2019-10-26 08:32:36 +08:00
lachwright
ca768b044d Merge branch 'master' into metalstuff 2019-10-26 08:30:37 +08:00
lachwright
63d24d529a Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00
MascaraSnake
03c5b70fc5 Merge branch 'newmenus' into 'master' 
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252)

Closes #245, #244, and #252

See merge request STJr/SRB2Internal!389
 2019-10-25 17:46:16 -04:00
MascaraSnake
4d022046fa Merge branch 'object_tweaks' into 'master' 
Object tweaks (object_tweaks division 3)

See merge request STJr/SRB2Internal!394
 2019-10-25 17:45:48 -04:00
MascaraSnake
1c1fefe25f Merge branch 'linedef-153' into 'master' 
Dynamic Sinking Platform (for Red Volcano Zone)

See merge request STJr/SRB2Internal!401
 2019-10-25 16:56:19 -04:00
MascaraSnake
46d105dd53 Some basic code hygiene: Remove references to the air bob code being "old" or "outdated" 2019-10-25 22:55:10 +02:00
MascaraSnake
2118b0e613 Merge branch 'hammer-landing' into 'master' 
Twinspin landing option

See merge request STJr/SRB2Internal!402
 2019-10-25 16:39:02 -04:00
MascaraSnake
faf61912a6 Merge branch 'lua-allow-player' into 'master' 
Allow access to players userdata outside levels.

See merge request STJr/SRB2Internal!386
 2019-10-25 15:40:31 -04:00
MascaraSnake
7d69409cf7 Merge branch 'set-name-on-join' into 'master' 
Set the player's name as soon as they enter the game

See merge request STJr/SRB2Internal!397
 2019-10-25 15:38:21 -04:00
MascaraSnake
4a9eb387f7 Merge branch 'window-focus-music' into 'master' 
Window focus options for playing sounds/music

See merge request STJr/SRB2Internal!407
 2019-10-25 15:37:06 -04:00
MascaraSnake
2a8e5b7bff Merge branch 'james-kart' into 'master' 
My changes to Kart

See merge request STJr/SRB2Internal!406
 2019-10-25 15:36:40 -04:00
MascaraSnake
f1a7a3b4de Merge branch 'kartport_misc-changes' into 'master' 
Kart ports: misc changes

See merge request STJr/SRB2Internal!380
 2019-10-25 15:33:30 -04:00
MascaraSnake
ff061fb813 Merge branch 'kartport_namedvalues' into 'master' 
Kart-port - Named cvar values + Improved "HELP" command (round 3)

See merge request STJr/SRB2Internal!388
 2019-10-25 15:32:56 -04:00
toaster
f2596ab0bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks 
# Conflicts:
#	extras/conf/SRB2-22.cfg
 2019-10-25 20:32:15 +01:00
MascaraSnake
403d698724 Merge branch 'mi-tinkers-with-lua-again' into 'master' 
MI tinkers with lua again

See merge request STJr/SRB2Internal!392
 2019-10-25 15:27:55 -04:00
MascaraSnake
d7480f20fa Merge branch 'intangible-flats-tangible-sides' into 'master' 
Collide with walls of FOF if both planes are intangible

See merge request STJr/SRB2Internal!385
 2019-10-25 15:26:54 -04:00
MascaraSnake
080ff854b8 Merge branch 'be-more-nice-with-levelselect-mp' into 'master' 
Remove level select restrictions in DEVELOP Multiplayer

Closes #238

See merge request STJr/SRB2Internal!399
 2019-10-25 15:26:09 -04:00
MascaraSnake
829706a090 Merge branch 'walltransfermove' into 'master' 
Let players move after spinning off a wall transfer

See merge request STJr/SRB2Internal!412
 2019-10-25 15:20:20 -04:00
MascaraSnake
5a28c03a26 Merge branch 'superminecarts' into 'master' 
Super and Minecarts fixes (resolves #259)

Closes #259

See merge request STJr/SRB2Internal!408
 2019-10-25 15:19:47 -04:00
MascaraSnake
2ee42c498b Merge branch 'nonightsbot' into 'master' 
Disable tailsbot in NiGHTS maps (resolves #261)

Closes #261

See merge request STJr/SRB2Internal!409
 2019-10-25 15:19:05 -04:00
MascaraSnake
7a09a8bd3a Merge branch 'cezfangcheat' into 'master' 
CEZ3 Fang cheat fix (resolves #262)

Closes #262

See merge request STJr/SRB2Internal!410
 2019-10-25 15:18:16 -04:00
lachwright
2d458059c8 Don't fuck nojumpspin characters who are capable of rolling 2019-10-25 18:51:41 +08:00
lachwright
d5b1467e79 Put player in jump state after spinning during a wall transfer 2019-10-25 18:48:40 +08:00
toaster
630bdaa876 Move INLEVEL macros for mobj_get and mobj_set to prevent mixed code/declaration errors. 2019-10-24 21:14:51 +01:00
toaster
d89d8acc59 I can't figure out how to make this consistent at all, so in order to have the water look good in levels designed for it, I think it's necessary to effectively revert everything with SHITPLANESPARENCY to a roughly 2.1-equivalent behaviour. 2019-10-24 20:40:03 +01:00
toaster
4ff46d14dd Added an experiment with an alternate CEZ3 pinch behaviour (but keep it disabled because it was kind of boring). 2019-10-24 19:55:02 +01:00
toaster
ea0fe50f5a Fix CEZ3's first phase being cheated by Fang. 2019-10-24 19:33:03 +01:00
toaster
527254584d Disable tailsbot in NiGHTS maps, not just Special Stages. (Resolves #261) 2019-10-24 19:16:53 +01:00
toaster
989e089e0a resolve #263 (this is going into master because it's literally just the line being present twice) 2019-10-24 19:00:54 +01:00
toaster
a215eeabf0 * Fix Super players who die being eternally super. 
* Fix music stack corruption in multiplayer where a super player dies and it's not you.
* Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch).

Resolves #259.
 2019-10-24 18:51:12 +01:00
James R
c970911ac2 The console sucks, so "Don't" becomes "No" :lancer: 2019-10-23 17:37:09 -07:00
James R
48173beb35 Menu options 2019-10-23 17:31:10 -07:00
James R
cd252eb468 Console variables to toggle music/sound playing when the window is unfocused 
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
 2019-10-23 17:21:09 -07:00
James R
9162ba87cc Revert sound and music window focus related toggles 
This partially reverts commit 5ac8a26814.
 2019-10-23 15:24:34 -07:00
Steel Titanium
bfce75d5cd
Disable restriction for `DEVELOP` builds only 2019-10-23 16:29:50 -04:00
MascaraSnake
0ef50557c2 Merge branch 'spinbust' into 'master' 
Make spinbust behavior consistent with other bustable blocks

Closes #254

See merge request STJr/SRB2Internal!398
 2019-10-23 02:51:47 -04:00
MascaraSnake
8cd0ebb679 Merge branch 'atz-hazards' into 'master' 
Azure Temple Hazards

See merge request STJr/SRB2Internal!404
 2019-10-23 02:51:00 -04:00
lachwright
06bbbb5cf8 Put dashmode players in pain state when damaging enemy with >1HP 2019-10-23 13:54:15 +08:00
lachwright
7be046e16c Fix compile warnings 2019-10-23 13:46:30 +08:00
lachwright
6d498fe357 Allow machine skins to damage objects in dashmode 2019-10-23 13:41:32 +08:00
James R
52c5d49215 Apply HUD translucency to ping and FPS counters 2019-10-22 21:54:09 -07:00
James R
d86be51472 Toggle ping and FPS counters with HUD 2019-10-22 21:50:51 -07:00
James R
0b314a82bb Use long double suffix 2019-10-22 21:48:15 -07:00
james
aa9f19512c Use less confusing player sorting key names 2019-10-22 21:41:34 -07:00
james
39baca89d3 Do not start sound system when disabled 2019-10-22 21:39:37 -07:00
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
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
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
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