Commit Graph

10836 Commits

Author SHA1 Message Date
Lachlan 84000a0add P_Earthquake: Use P_RadiusAttack in favor of thinker iteration 2020-07-04 04:00:28 +08:00
Lachlan 7e72009a87 Fix buildbot warning 2020-07-04 03:21:48 +08:00
SteelT 186335c2ac Merge branch 'na-char-replays' into 'next'
Add support for saving/loading per-skin NiGHTS replays

See merge request STJr/SRB2!1025
2020-07-03 14:51:05 -04:00
lachwright 8652bbc1a5 Knuckles changes:
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
colette 1cc2ab120d "Legacy controls" was a mistake of a name 2020-07-02 23:17:33 -04:00
Hannu Hanhi b29873ce1c Better MF2_LINKDRAW support for OpenGL 2020-07-03 00:28:52 +03:00
lachwright 3ebc17ac3a Merge branch 'next' into knuxtweaks 2020-07-02 13:08:04 +08:00
Zippy_Zolton 29dfa5f605 sound caption 2020-07-01 23:18:20 -05:00
James R 9eb58a8e42 Merge branch 'cheese' into 'next'
Cheese

See merge request STJr/SRB2!1028
2020-07-01 23:28:08 -04:00
James R 7a17c74893 Merge branch 'credits-225' into 'next'
More credits changes

See merge request STJr/SRB2!1027
2020-07-01 23:27:59 -04:00
James R b34db0a38a Merge branch 'fix-polyobject-rotation-crash' into 'next'
Fix crash when a polyobject rotates a non-player mobj

See merge request STJr/SRB2!1026
2020-07-01 19:40:36 -04:00
James R 2cbf7ac27d Cheese mode activate! 2020-07-01 16:37:36 -07:00
James R e1996a437d Add "Discord Community Testers" to the Testing section 2020-07-01 16:29:26 -07:00
James R 99a9c935f9 Credits: add back fickle, add Chrispy and Hannu 2020-07-01 16:23:26 -07:00
James R fae583915a Remove Producer role from the credits 2020-07-01 16:04:46 -07:00
Nev3r ff8759e507 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Louis-Antoine 40e98e5712 Fix crash when a polyobject rotates a non-player mobj 2020-06-30 18:37:21 +02:00
Steel Titanium 612386aef0 Correct comment 2020-06-29 23:57:39 -04:00
Steel Titanium e641895268 Address compat with old-style names 2020-06-29 23:54:45 -04:00
James R 696f9707fc Merge branch 'special_save' into 'next'
Special saves! (Resolves #162)

Closes #162

See merge request STJr/SRB2!1016
2020-06-29 19:18:30 -04:00
James R 84391f558b Merge branch 'titlecard-double-clown-town' into 'next'
ACTUALLY fix #172

Closes #172

See merge request STJr/SRB2!1020
2020-06-28 18:41:22 -04:00
James R e56fc08757 Merge branch 'delete-connection-screen-and-midgame-joins' into 'next'
Delete connection screen and midgame joins

See merge request STJr/SRB2!1021
2020-06-28 18:41:07 -04:00
Steel Titanium 3f3ff0688b Add support for saving/loading per-skin NiGHTS replays 2020-06-28 16:59:36 -04:00
James R 335fc0b327 Use levelflat->name instead of flatname 2020-06-27 14:30:41 -07:00
SteelT 22459df1f1 Merge branch 'increase-input-buffer-more' into 'next'
Increase the length of the player input buffer even more

See merge request STJr/SRB2!951
2020-06-27 13:32:19 -04:00
GoldenTails fef15be0af Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with 2020-06-27 10:56:15 -05:00
LJ Sonic a4cb0751c0 Merge branch 'lua-server-variables' into 'next'
Expose "server" and "dedicated" to Lua scripts

See merge request STJr/SRB2!1022
2020-06-27 09:50:30 -04:00
Louis-Antoine 93cc48054a Expose "server" and "dedicated" to Lua scripts
Careful! Both are local variables and are always false for clients,
and therefore should obviously not be used in anything gamelogic-related.
2020-06-27 15:30:23 +02:00
Louis-Antoine c96e07b61c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
Louis-Antoine 82dbe95e22 Fix computation of very high pings 2020-06-26 15:34:26 +02:00
James R fbbfe3b3b1 Add back the int_none check
It got removed by 864e703355 but he forget how it
was before the hook was there. :(
2020-06-25 13:43:07 -07:00
James R 607a4dbee7 Remove caching of INTERSCW 2020-06-25 13:09:00 -07:00
James R 78e6bcc8ff Just stretch the fallback card to the screen resolution 2020-06-25 13:08:00 -07:00
James R 864e703355 Only fill the intermission with blapck if we can't draw patches
This fixes an issue where patches cease to be drawn due to Y_UnloadData, but
the screen is still overwritten, causing the next wipe to start from void.
2020-06-25 13:04:03 -07:00
James R 0435acd516 Merge branch 'gamequit-hook' into 'next'
GameQuit Hook

See merge request STJr/SRB2!847
2020-06-25 12:45:20 -04:00
Zachary McAlpin b973b43271 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-25 10:31:55 -05:00
toaster f258131e55 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save
# Conflicts:
#	src/g_game.c
2020-06-25 10:48:36 +01:00
Zippy_Zolton dc2f689957 Jet Jaw Sounds 2020-06-25 00:38:07 -05:00
James R 7317bbb692 Merge branch 'ogl-sprite-qsort' into 'next'
Faster OGL sprite sorting algorithm

See merge request STJr/SRB2!1008
2020-06-24 23:22:06 -04:00
James R 8c3e2728d5 Merge branch 'gtr-fixes' into 'next'
Gametype fixes

See merge request STJr/SRB2!816
2020-06-24 23:01:11 -04:00
James R 067d9b9a63 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
Zachary McAlpin b14f18c1a9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 20:55:08 -05:00
James R 207d8aee4b Merge branch 'acz3-softlock-fix' into 'next'
ACZ3 softlock fix

See merge request STJr/SRB2!1015
2020-06-24 21:43:42 -04:00
James R 95cc10d735 Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next'
Don't repeatedly look for model texture files

See merge request STJr/SRB2!1009
2020-06-24 21:42:40 -04:00
James R 9eb8fd8ac8 Merge branch 'fixeggsign' into 'next'
Fix the Eggman signpost's background color

See merge request STJr/SRB2!1007
2020-06-24 21:42:12 -04:00
James R 2e827705b4 Merge branch 'ogl-drawnode-fix' into 'next'
Faster and more correct OGL transparent surface sorting

See merge request STJr/SRB2!1005
2020-06-24 21:42:01 -04:00
James R ac71bb76b6 Merge branch 'gme-cleanup-fixes' into 'next'
GME cleanup and fixes

See merge request STJr/SRB2!1001
2020-06-24 21:41:49 -04:00
Zachary McAlpin 5ef8c95cdb Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-24 19:47:52 -05:00
Monster Iestyn 7d2de8394f Merge branch 'lua-side-enum-bruh' into 'next'
Fix missing bruh string in Lua side string options.

See merge request STJr/SRB2!1017
2020-06-22 15:23:34 -04:00
Latapostrophe 80e0d35391 Fix missing bruh string in lua side options. This is stupid. 2020-06-22 21:11:33 +02:00