Monster Iestyn
5a16c39af0
XBOX was eXecuted
2017-09-29 19:27:17 +01:00
Monster Iestyn
de4ea022c0
Merge branch 'public_next'
2017-09-29 17:23:47 +01:00
Monster Iestyn
ea372fae53
Merge branch 'master' into next
2017-09-29 17:15:57 +01:00
Monster Iestyn
c90ddbca36
Merge branch 'makefile-ports-tweaks-cleanup-etc' into 'master'
...
Makefile ports tweaks cleanup etc
See merge request !211
2017-09-28 17:31:33 -04:00
Alam Ed Arias
f1a347e55f
Merge branch 'public_next' into master
2017-09-28 11:01:20 -04:00
Alam Ed Arias
ec125628ab
Merge branch 'master' into next
2017-09-28 10:16:35 -04:00
Alam Ed Arias
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
toaster
3cc14e3985
Merge branch 'directionchar' into 'master'
...
Autobrake & decoupling player sprite angle from camera angle
See merge request !69
2017-09-19 07:56:22 -04:00
toasterbabe
f90d595332
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist.
...
* cv_useranalog is now hidden from the menu.
* Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum.
* Tailsbot is now slightly more capable of keeping up with Sonic.
* pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL.
* [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-16 20:25:14 +01:00
Monster Iestyn
900bab9b13
Fix includes for SDL 1.2-only ports' files
2017-09-14 21:15:38 +01:00
Monster Iestyn
9c4e2eeeef
Merge branch 'next' into netcode-fixes-the-sequel
2017-08-23 19:17:25 +01:00
Monster Iestyn
9805b82fec
Disable "connect self" due to being broken, cleaned up ip+port part
...
Anyone know if "connect any" work at all? Would have disabled that too but apparently the game uses it if "-connect" is given with no params
2017-08-18 18:14:03 +01:00
toasterbabe
6250266af5
Preparatory work for the contestesque implementation.
2017-07-17 23:26:24 +01:00
toasterbabe
9bd10fb0d2
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop
2017-07-17 16:44:10 +01:00
Monster Iestyn
023d91a02e
Merge branch 'public_next'
...
# Conflicts:
# src/y_inter.c
2017-07-08 17:49:54 +01:00
Monster Iestyn
f0ffd691f4
Merge branch 'master' into next
2017-07-07 22:47:34 +01:00
Monster Iestyn
4752109233
Some more tweaks of my own:
...
*Add CONS_Printf messages for !netgame checks
*Arg count is checked first regardless of netgame status for both kick and ban, < 2 is checked instead of == 1 just in case these weren't called from console for some stupid reason?
*Moved Command_Kick's buffer vars to within the code that actually does kicking stuff
2017-07-07 22:40:00 +01:00
toasterbabe
9a1e1180ff
Also account for bans, pff.
2017-07-05 16:29:21 +01:00
toasterbabe
60e21381ab
Don't kick Tails!
...
Also, a movement for the WRITESINT8 to prevent modification to buf if the function bails early.
2017-07-05 16:20:23 +01:00
toasterbabe
50496970d1
Fix weird visual artifacting caused by restarting the level in co-op, which was a direct result of my code being messy. This is significantly better to deal with, anyways.
2017-07-03 15:43:29 +01:00
toasterbabe
ca76dd41f8
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop
...
# Conflicts:
# src/p_user.c
2017-07-03 15:41:00 +01:00
Monster Iestyn
e3f627120f
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/p_mobj.c
2017-06-23 17:19:06 +01:00
Monster Iestyn
02c098574c
ah, turns out the TIC n debugfile print is a remnant of when Doom Legacy printed the consistancy return value... which we'll do here now too, in that case
2017-06-10 17:09:08 +01:00
Monster Iestyn
b9828f78e8
Fix stupid lack of newline with this message
2017-06-09 23:22:27 +01:00
toasterbabe
51f0d6f2e2
Import some NiGHTS stuff from some-more-nights-fixes, so I can delete that old branch.
2017-06-01 22:20:36 +01:00
Monster Iestyn
2e42c9621c
Eck, potted another node/player confusion for clients reciving PT_PING
2017-06-01 20:46:44 +01:00
Monster Iestyn
fe15305df0
Merge the two NEWPING parts of NetUpdate into one block
2017-06-01 20:43:24 +01:00
Monster Iestyn
3d86e7135d
Fix confusion between nodes and players in ping updating code and PT_PING packet sending code
2017-06-01 19:01:57 +01:00
Monster Iestyn
3f9bebd05e
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/lua_thinkerlib.c
2017-05-31 15:18:05 +01:00
Monster Iestyn
806b101984
Merge branch 'master' into next
2017-05-27 20:10:48 +01:00
Monster Iestyn
d20efa5a74
Entirely ignore PT_ASKINFOVIAMS packets, since it turns out it's not even sent by the MS anyway
2017-05-27 19:06:46 +01:00
Monster Iestyn
11d57fba1b
Merge branch 'master' into next
2017-05-26 23:02:06 +01:00
Monster Iestyn
ab5835cd3b
Remove cruft from my initial days of fumbling with this branch
...
textcmd[0] for PT_NODETIMEOUT can't hold anything < 0 anyway, and you'd probably have to really try to get >= MAXNETNODES
2017-05-26 15:26:00 +01:00
Monster Iestyn
aecc97ded3
PT_REQUESTFILE checking:
...
* if you sent it to a client rather than the server, game over, your connection is closed
* if files that don't exist or are too large are requested are listed, game over, your connection is closed (they should have been checked on YOUR side beforehand, silly)
* if the server has downloading disabled anyway, ...yeah, you get the idea
Don't worry, I made sure Got_RequestFilePak cleaned up the full file request list for the node in case of failure
2017-05-26 13:39:54 +01:00
Monster Iestyn
a23e9bc32b
Fix size_t printing
2017-05-25 18:10:20 +01:00
toasterbabe
47e171250f
* Prevent joining a server if you have too many files loaded to add the remainder.
...
* Made the check in Got_RequestAddfilecmd more comprehensive, since I might as well. Just something to tweak a little later in internal.
2017-05-25 16:06:39 +01:00
Monster Iestyn
c92aaa74a4
I think PT_CLIENT2MIS was meant to do this too, probably
2017-05-23 18:46:34 +01:00
Monster Iestyn
7147e0fcaf
Improve previous PT_TEXTCMD/PT_TEXTCMD2 check, add another one to ignore zero size textcmds!
2017-05-23 17:35:32 +01:00
Monster Iestyn
0b0b738a6f
Don't allow non-servers to receive PT_RESYNCHGET
2017-05-23 16:34:56 +01:00
Monster Iestyn
ff1cc07a1d
Implemented toaster's suggestion to make a macro here
2017-05-23 16:29:09 +01:00
Monster Iestyn
9e3bdc5ee2
Prevent bad PT_TEXTCMD/PT_TEXTCMD2 textcmd[0] sizes?
2017-05-23 16:13:42 +01:00
Monster Iestyn
fdfd6e1c0b
Whoops don't do that for PT_REQUESTFILE
2017-05-22 22:20:08 +01:00
Monster Iestyn
c70839334e
Added a bunch of missing checks to prevent non-server players from sending other non-server players stuff
2017-05-22 22:17:51 +01:00
Monster Iestyn
3784d765e4
Remove extra whitespace I added
2017-05-22 20:47:38 +01:00
Monster Iestyn
28444c12dd
Some more things I overlooked in this fix
2017-05-22 16:54:39 +01:00
Monster Iestyn
247ed56e17
Don't allow nonsense PT_ASKINFOVIAMS packets, nor any at all if offline
2017-05-22 16:44:50 +01:00
Monster Iestyn
5a1fc6098e
Attempts to prevent stupid stuff from happening
2017-05-19 11:25:28 +01:00
Monster Iestyn
c4e7bef01a
Merge branch 'public_next'
2017-05-01 17:38:35 +01:00
Monster Iestyn
93efb3084e
Merge branch 'mi-a-bit-of-cleanup' into 'master'
...
MI's unimportant code cleanup
Just removing a bunch of unused variables/function prototypes from the source code and similarly minor stuff, nothing here should change gameplay much (if at all).
See merge request !71
2017-04-17 14:43:50 -04:00
toasterbabe
ddf8db12af
Big commit, sorry. I broke several things trying to get other things to work and it's only now that all the code that worked yesterday works today!
...
*P_LookForEnemies is now side-effect-less and only provides a pointer to the found mobj
*player-jumping is dead, long live PF_STARTJUMP
*per Mystic's request, CA2_GUNSLINGER has a targeting icon. It also has a more restricted vertical aiming range.
*mobj for this is in the game as requested
*fast teetering animation flag
*general code cleanup
2017-03-22 18:51:30 +00:00
