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
mazmazz
8a8e91914b
Merge remote-tracking branch 'origin/new-title' into new-title
2019-10-25 22:28:31 -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
MascaraSnake
6c60a67a4f
Merge branch 'waterlighting' into 'master'
...
Water lighting reversion (resolves #188 for now)
Closes #188
See merge request STJr/SRB2Internal!411
2019-10-25 15:17:35 -04:00
MascaraSnake
53ac815334
...and also rename the palm tree leaves accordingly
2019-10-25 20:48:51 +02:00
MascaraSnake
863101824a
Removed palm tree trunks from the ZB config. They no longer exist as mapthings.
2019-10-25 20:17:50 +02: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