TehRealSalt
e84c618da8
Rudimentary Record Attack support
2019-09-24 07:17:05 -04:00
TehRealSalt
e502a74a3f
Use memset
2019-09-23 20:19:57 -04:00
TehRealSalt
9072f233eb
Remove a few more magic numbers
2019-09-23 08:31:36 -04:00
TehRealSalt
38bb44e732
Separate into k_pwrlv.c, add defines to reduce amount of magic numbers
2019-09-23 08:26:42 -04:00
TehRealSalt
9e587f4d0d
Put prints behind CONS_Debug
2019-09-23 07:26:36 -04:00
TehRealSalt
77aeb4663b
Merge branch 'master' into versus-record
2019-09-23 07:03:56 -04:00
TehRealSalt
1ef09699d1
Functional gameplay
...
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score
Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
Jaime Passos
0d11dd516a
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
Latapostrophe
e1e179d73b
I'm an idiot and forgot to let you download files
2019-09-09 22:26:09 +02:00
toaster
41727318ff
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-09 15:25:48 +01:00
Monster Iestyn
361fbf8f6a
Merge branch 'mprelated-tweaks' into 'master'
...
Various improvements and changes to multiplayer menu
See merge request STJr/SRB2Internal!300
2019-09-08 16:45:14 -04:00
toaster
09f7dc1350
* Store gravflip ( resolves #206 ) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
...
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191 ).
2019-09-07 22:12:47 +01:00
Jaime Passos
4304c34679
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 23:35:36 -03:00
Jaime Passos
24d08edf05
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 20:27:50 -03:00
toaster
0700ad229f
Lots of death stuff.
...
* Genesis-style love and attention to the death event.
* Only visibly decrement lives/rings when you're respawning (or game over, see below).
* Faster no-button-press respawn.
* Game Over specific love.
* Animation of Level Title font coming in from the sides.
* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
* Change gameovertics to 10 seconds instead of 15.
* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.
Also, two not-quite death things which nonetheless were relevant to change:
* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
2019-09-01 15:55:23 +01:00
Steel Titanium
2fc5ee0ec3
Move some cvars out of D_ClientServerInit and save them
...
Ported over from Kart
2019-08-26 20:38:32 -04:00
James R
d51b516446
Show a negative number to indicate ammo penalty
2019-08-26 16:07:17 -07:00
James R
35be353de4
Save bans when cleared too
...
(Why doesn't it work for I_Quit?)
2019-08-22 15:18:14 -07:00
Monster Iestyn
0b6a463cff
Merge branch 'public_next'
...
# Conflicts:
# src/config.h.in
# src/d_clisrv.c
# src/d_netcmd.c
# src/doomdef.h
# src/p_map.c
# src/p_maputl.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
James R
f335519007
Remove a printf
2019-08-17 10:33:33 -07:00
James R
f69983c010
Kart discrepancies
2019-08-17 10:33:14 -07:00
mazmazz
4ac4034eb9
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-08-04 21:33:13 -04:00
Latapostrophe
ec1272dd14
remove join passwords
2019-08-04 11:26:26 +02:00
James R
374af9a322
Merge remote-tracking branch 'pub/master' into public-master
2019-07-17 12:33:20 -07:00
James R
6fdfd3b90c
Don't send login final hashes to everyone
...
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.
P.S. The netcode is LOL XD by VincyTM -Telos
2019-07-15 16:14:00 -07:00
Jonas Sauer
b7c783223a
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
...
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
MascaraSnake
9f666e125e
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:08:37 +02:00
mazmazz
14df513db6
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
mazmazz
11955ba838
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
Sryder
3d6161c7ca
Fix compatibility with the MS (Specifically Doomseeker)
...
Send back 32 players worth of playerinfo regardless of MAXPLAYERS. Fill the extra with unconnected nodes.
2019-06-17 21:04:48 +01:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
Monster Iestyn
04a8c9a283
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
TehRealSalt
dc41fe3d8d
Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff
2019-05-12 17:19:49 -04:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
mazmazz
dc14318f02
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-08 17:56:05 -04:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
d82fa7eb60
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
Sal
80226b3c39
Merge branch 'skins-fix' into 'v1'
...
Remove skin shit
See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04:00
wolfs
741f48132a
Merge branch 'newping' into 'master'
...
New ping command
See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
Monster Iestyn
a0e135f1b8
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
Nev3r
7a66fabf4f
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
mazmazz
d944156744
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
mazmazz
f9354289ba
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -04:00
TehRealSalt
f1f664e9b1
Merge v1
2019-05-02 01:36:19 -04:00
TehRealSalt
e59a7175be
Fix skin shit
2019-05-02 00:39:49 -04:00
James R
fd251ed29f
Move some cvars out of D_ClientServerInit and save them
2019-04-27 17:30:39 -07:00
TehRealSalt
ed093e0856
Display on server browser
2019-04-26 14:07:48 -04:00
wolfs
f624d2acda
Merge branch 'save-showjoinaddress' into 'master'
...
Save showjoinaddress to config
See merge request KartKrew/Kart-Public!132
2019-04-25 23:17:07 -04:00
Steel Titanium
cae59aad9a
Save showjoinaddress to config
2019-04-25 23:13:09 -04:00