lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2661 commits 1 branch 29 tags 122 MiB
Commit graph

2661 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn c43b41815f Make "Enter Game" option use the big blue window notice if you cannot switch teams, instead of falling back on changeteam's own console notice 2017-03-02 14:28:52 +00:00
Monster Iestyn b837d5b23d Fix teamchange/teamchange2 to block changing FROM spectator rather than changing TO spectator 
This way they're consistent with Got_Teamchange, which is the cause of the "illegal team change" desyncs
 2017-03-02 14:25:46 +00:00
Monster Iestyn 6f2f244aef 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
 2017-02-22 21:07:29 +00:00
Monster Iestyn 6efb15c6e8 Fix Ban_Add usage for NONET 2017-02-20 21:36:05 +00:00
Monster Iestyn 7424df8180 Make sure I_Ban and Ban_Add are only used by the server 
Also make sure the server actually uses Ban_Add if an admin banned someone
 2017-02-20 19:58:29 +00:00
toasterbabe 76c15a0e97 Salt's suggestion. 2017-02-18 21:17:20 +00:00
toasterbabe cf45067d9c Gametype descriptions. 
https://gfycat.com/RelievedUnselfishChinchilla (competition's desc is slightly reworded but I'm too lazy to retake the gfy)
 2017-02-18 17:09:03 +00:00
toasterbabe 2f9db4486a Minor corrections. 2017-02-18 14:03:49 +00:00
toasterbabe c882851f14 Wide icons for the level select platter's exclusive usage. 
https://gfycat.com/MenacingClearAngora

More for what's coming than what's here right now, but still quite pretty as a placeholder.
 2017-02-17 01:45:21 +00:00
Monster Iestyn 84727f4205 Created W_OpenWadFile for opening WAD files with the path correction code. 
This is used by Command_Addfile in the MD5 calculation code, so that it can search subfolders properly and allow addfile in netgames to treat them the same way as in SP
 2017-02-16 21:55:17 +00:00
Monster Iestyn a27367cdd4 Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore) 2017-02-15 21:16:56 +00:00
toasterbabe 758bec6963 Fixed a bunch of awkwardness where Metal wouldn't reset himself properly when his target died. 2017-02-14 02:07:08 +00:00
toasterbabe a04ae45a93 MORE CUES 2017-02-13 18:53:16 +00:00
toasterbabe 3feac5bc90 bad bounce https://gfycat.com/DeliciousReliableGentoopenguin 2017-02-13 18:04:08 +00:00
toasterbabe 5f3cfc6729 Some cleanup. 2017-02-12 14:16:52 +00:00
toasterbabe 6dfef794a4 Metal Sonic's bounce attack is much nicer. Also, a bunch of other minor tweaks. 2017-02-12 01:28:12 +00:00
Monster Iestyn 8f1deb9128 Remove unused "runcount" variable from p_local.h 2017-02-11 23:28:42 +00:00
Monster Iestyn a51548abea "t" is not needed to take out fencepost cases from viewangletox 2017-02-11 23:24:12 +00:00
Monster Iestyn a5001a6af9 Removed unused function prototypes in d_main.h 
Also corrected what appears to be a typo in some comments above?
 2017-02-11 22:56:08 +00:00
Monster Iestyn f4e5233c7e Remove unused sscount variable 
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
 2017-02-11 22:41:15 +00:00
Monster Iestyn 0def5330c0 Merge branch 'master' into mi-a-bit-of-cleanup 2017-02-11 21:13:28 +00:00
toasterbabe a66567ea0f borp https://gfycat.com/AcceptableWhiteJabiru 
doesn't do anything in ogl sorry, inu might change that later but
 2017-02-10 23:24:06 +00:00
Monster Iestyn 8a421a05d9 admin bans with custom ban messages should now be recognised by the server properly 2017-02-10 20:31:58 +00:00
toasterbabe 9fc757f388 Inuyasha: You were right. 
* Changed the order of Record/Nights Attack and its level select menu option so that you go from the main menu to the map page to level select, rather than main menu to level select to map page.
* Cleaned up a lot of code.
 2017-02-10 14:54:05 +00:00
toasterbabe 8cdcb2c416 * You can now bounce off of springs without unbouncing. 
* You can now bounce off the bottom of goop areas.
* Fixed that long-standing bug where you could accelerate whilst rolling.
 2017-02-09 23:24:47 +00:00
Monster Iestyn 9b737d1165 Merge branch 'record-attack-custom-exit-fix' into 'next' 
Record attack custom exit fix

This fixes the bug reported here: http://mb.srb2.org/showthread.php?t=42342

Record Attack now no longer allows the tally to be skipped, whether by custom exits or by Lua etc.

See merge request !164
 2017-02-08 20:18:06 -05:00
toasterbabe 7b4688732b * Float ability now properly stacks with dashmode. 
* Corrected a scenario where you could get a CTF flag mid-dashmode and have dashmode properties forever.
 2017-02-08 16:46:16 +00:00
toasterbabe 29c48c1992 As defined in spec, lose a bit of chain each time you bounce on land. 2017-02-08 16:08:36 +00:00
Monster Iestyn f9b41898a9 Don't allow skipping stats in record attack/nights attack 2017-02-05 22:04:29 +00:00
toasterbabe d670189c89 * Fixed the Mode Attack cv_nextmap issue Salt found. 
* Improved the defaulting system to work cross-gametype.
* Cleaned up the code. Less hacks!
 2017-02-05 21:20:32 +00:00
Monster Iestyn 591fe13cc0 Merge branch 'dedicated-console-fix' into 'master' 
Dedicated console shift-down fix

This fixes the special console window used by dedicated mode not properly telling the game when shift is held down since the console improvements added in 2.1.17. This means shift+1 is properly interpreted as "!" again rather than 1, shift+- should be "_" rather than "-", etc.

Sorry LJSonic your problems from pre-2.1.17 are probably just your keyboard being for a different locale than the one most SRB2 players play with so I'm aware, I'm not sure what can be done for the time being. =V

Fun note, you can see how the game interprets un-executed input to the console window by playing normal (not dedicated) SRB2 with `-console`, which creates a second window for the console just like you'd see for dedicated mode. Drop down the console on the main SRB2 window, switch to the console window and type something in (DON'T PRESS ENTER), and you'll see the input appearing in the input space in the console window at the same time!

See merge request !163
 2017-02-05 14:44:50 -05:00
Monster Iestyn dc249c6cd5 D_ModifierKeyResponder now checks for ev_console as a "key down" event 
console window uses ev_keyup too so don't worry about turning off
 2017-02-04 23:26:37 +00:00
toasterbabe abc218de38 I am bad at conditions. 2017-02-04 21:41:43 +00:00
toasterbabe 5170fafcac * CA_BOUNCE is now more pleasant to control. 
* CA_MELEE can now break downwards like CA_BOUNCE, and CA_TWINSPIN can break both up and downwards.
 2017-02-04 18:25:16 +00:00
toasterbabe ba652864a6 Revamped roll-on-landing to work even from jumping, for the purposes of slopes! (But not from PF_THOKKED.) 
Salt has wanted this for a while, and this was the only branch I had open which it was appropriate for. :P
 2017-02-04 17:08:14 +00:00
toasterbabe c04ee6bfb7 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3 2017-02-04 15:19:02 +00:00
Monster Iestyn 9a2b7b2091 Better plan, use ?: for deciding between floorz/ceiling checks based on gravity 2017-02-03 20:13:16 +00:00
Monster Iestyn 659a62db88 Make sure rocks spawned by the rock spawners despawn when they're on the floor and not moving 2017-02-03 18:47:20 +00:00
Monster Iestyn 823aa7d24d Merge branch 'td-render-fix2' into 'master' 
TD render fix 2: Electric boogaloo

This fixes TD's terminal stage freezing the game in a similar manner to Lava Mountain, except this time the FOFs aren't zero-height so it's a slightly different situation?

See merge request !160
 2017-02-03 12:27:03 -05:00
toasterbabe 3aa7573c86 Made code repetition less. 2017-02-02 16:10:37 +00:00
toasterbabe 42518a1759 For consistency purposes, added trailing ellipses to level selection prompts I added. 2017-02-02 16:02:07 +00:00
toasterbabe 590ffae391 Maximum length for name strings on level platters. http://i.imgur.com/FFXmVlY.png 2017-02-02 12:52:39 +00:00
toasterbabe 55e736250a Clear out some irrelevant/redundant functions now there are no non-platter Level Selects available. 2017-02-02 12:32:02 +00:00
toasterbabe 05ebc93f6c After discussion with Mystic and Rob, you now keep your lives, score and emerald count when changing maps in Co-op mode. Reset when you declare -force. 2017-02-01 21:31:35 +00:00
toasterbabe 8625c8bfbd Removed extraenous space. 2017-02-01 21:30:10 +00:00
toasterbabe 8ebb4a3c3f Making things nicer for the server creation menus of 2P mode and NONET executables. 2017-02-01 17:36:19 +00:00
toasterbabe 4efeb02978 Added some useful options to the Server setup menu, including a jump-link to the relevant Options screen. Think it should be a little smarter designed, though, but I'd rather commit what I have then let it languish. 2017-02-01 17:21:04 +00:00
toasterbabe 873e768a44 Server page (and splitscreen server page) started. 
http://i.imgur.com/jJ3YZUd.png

Will be discussing what to do with the space freed under "server options" the heading on IRC tomorrow.

(MI, if you're looking - the mistake was that I set up an IT_CALL menu line as IT_CVAR by mistake, which of course caused a crash when trying to get ((consvar_t *)M_GameTypeChange)->string. ;P )
 2017-01-31 23:56:09 +00:00
Monster Iestyn 72bd3e28ed Fix sprtopscreen from getting integer overflows once and for all in R_DrawRepeatMaskedColumn 
Fixes TD's terminal from freezing the game this time, oh boy
 2017-01-31 22:10:31 +00:00
toasterbabe 3cb2f178c6 Getting closer to done. 
Updated the mid-game gametype/level select menu! Just need to combine it with the server creation menu, and then I'll be ready to make a merge request...
 2017-01-31 18:48:50 +00:00