toasterbabe
3c74952522
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
2018-04-06 12:54:39 +01:00
Alam Ed Arias
59f5b46ad3
Merge branch 'public_next' into master
2018-04-03 16:09:11 -04:00
toasterbabe
33afd94252
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
...
# Conflicts:
# src/d_main.c
# src/st_stuff.c
2018-03-24 17:17:01 +00:00
Monster Iestyn
145616b152
Merge branch 'master' into next
2018-03-08 19:35:51 +00:00
Monster Iestyn
aba4adfabc
shrunk buffer from 32 to 28 so that all of "Downloading "extremely...longname.wad"" can fit on screen at once.
2018-03-06 20:52:55 +00:00
Monster Iestyn
a66824d63f
replace the 3 strncpys with a snprintf
2018-03-06 20:20:27 +00:00
Monster Iestyn
e3151f26dc
rewrite download file screen code:
...
* fix screen to properly truncate the filename to just the real name only
* if the real name itself is too long, use ellipsis and paste in parts of the start and end of the actual name
note: I haven't actually tested if this works or compiles yet, I haven't the time right now
2018-03-05 22:24:03 +00:00
Alam Ed Arias
306cbc43e2
Merge branch 'public_next' into private
2018-02-14 10:34:36 -05:00
Alam Ed Arias
99552c2ba2
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
Louis-Antoine
c7320f9f82
Don't allocate memory for net commands already executed, as it would cause them to be never freed
2018-02-14 15:09:52 +01:00
toasterbabe
b69cbd85b9
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
2018-02-12 18:59:01 +00:00
toasterbabe
c1b48ea79f
* Total overhaul of V_DrawFadeScreen(color, strength!
...
- controllable strengths between 0-31 for COLORMAP lump like before
- arbitrary colour indices in the palette via TRANSMAP lumps, with strengths 0-9
- exposed to Lua as v.fadeScreen(color, strength)!
* Remove last vestiges of V_STATICPATCH.
2018-02-12 17:47:31 +00:00
Monster Iestyn
b1695de124
Merge branch 'public_next'
2018-02-08 20:31:53 +00:00
Monster Iestyn
0ef7aff5c0
Prevent SV_SpawnPlayer from being able to freeze the game if gametic is 0. Additionally add a sanity check to prevent the loop going on more than necessary anyway
...
This commit fixes -playdemo and -timedemo params for command line, allowing them to actually work again
2018-01-16 15:21:49 +00:00
Monster Iestyn
61176ee736
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
# src/win32/win_vid.c
2018-01-02 17:32:24 +00:00
Monster Iestyn
6886a29e99
Merge branch 'master' into next
2017-12-24 20:06:33 +00:00
LJSonik
36ce6579b7
Merge branch 'master' into download-freeze-fix
2017-12-18 21:39:16 +01:00
Louis-Antoine
47481804da
Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix
2017-12-18 21:38:10 +01:00
Louis-Antoine
c8e9e779e7
Add a short comment to explain the newplayernum hack
2017-12-18 21:35:02 +01:00
Alam Ed Arias
57a7a3bed8
Merge branch 'master' into next
2017-12-17 22:22:57 -05:00
LJSonik
084a534f6a
Merge branch 'master' into download-freeze-fix
2017-12-17 22:48:13 +01:00
LJSonik
9c7ff6e0c3
Merge branch 'master' into resynch-fixes
2017-12-17 22:47:23 +01:00
Louis-Antoine
4e89c03b0f
Node and player isn't the same thing !#^&*%^:'\[[^!#^$4&@(é@*(&$*@#à $%@
2017-12-12 23:08:18 +01:00
Louis-Antoine
16b8265c6e
F stands for Fun. You want more Fun, don't you?
2017-12-12 22:48:08 +01:00
Louis-Antoine
67aba2648c
Fix download freezes (well, most of them)
2017-11-03 22:58:47 +01:00
Monster Iestyn
bfca420f47
Merge branch 'master' into gametype-strings
2017-10-30 21:34:16 +00:00
Monster Iestyn
3e595b8f1b
Merge branch 'master' into ports-chopping-block
2017-10-14 20:47:04 +01:00
toasterbabe
844416855f
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
2017-10-02 14:08:58 +01:00
Monster Iestyn
302d0425e0
Incinerated WinCE
2017-09-29 23:25:34 +01:00
Monster Iestyn
49542cdaa1
Remove XBOXSTATIC and FILESTAMP, since only the XBOX port needed them
2017-09-29 19:46:23 +01:00
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
Monster Iestyn
025891d2aa
Merge branch 'master' into gametype-strings
2017-07-25 19:10:38 +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
