Steel Titanium
edd4f5e698
Update md5 hash for player.dta and patch.pk3
2020-07-06 21:22:57 -04:00
LJ Sonic
88790a8d39
Merge branch 'fix-timeout' into 'next'
...
Fix timeout
See merge request STJr/SRB2!1038
2020-07-06 20:10:08 -04:00
Louis-Antoine
e3ef4d966a
Fix timeout
2020-07-07 02:06:26 +02:00
Jaime Passos
a9da775dd9
Merge remote-tracking branch 'origin/next' into opengl-blending-fix
2020-07-06 19:48:13 -03:00
Jaime Passos
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
Steel Titanium
29d6b5c758
Merge branch 'master' into next
2020-07-06 12:13:00 -04:00
Nev3r
e361663eb8
Fix erroneous merge conflict resolution.
2020-07-06 11:54:55 +02:00
Nev3r
6b38fe4b2c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-06 11:13:27 +02:00
Jaime Passos
9788afa820
Remove Software tricks
2020-07-06 01:26:56 -03:00
Jaime Passos
615c7121ed
gr_ -> gl_
2020-07-06 01:15:08 -03:00
Jaime Passos
ff7b9a5b5c
Remove unused texture formats
2020-07-06 00:58:09 -03:00
Jaime Passos
d283cc1d2a
Rename structs, turn GrTextureFormat_t into an enum
2020-07-06 00:52:10 -03:00
Jaime Passos
146da28f88
Remove GrTexInfo
2020-07-06 00:35:48 -03:00
Jaime Passos
abc4f22a3e
Delete hw_glide.h
2020-07-06 00:27:34 -03:00
Hannu Hanhi
c03f5a0706
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
2020-07-05 13:27:51 +03:00
James R
dfd5cbf41f
Merge branch 'hahaha-credits' into 'next'
...
The credit
See merge request STJr/SRB2!1033
2020-07-04 18:00:49 -04:00
LJ Sonic
83f53943a6
Merge branch 'knuxtweaks' into 'next'
...
Knuckles tweaks
See merge request STJr/SRB2!1030
2020-07-04 16:37:35 -04:00
James R
948df3a746
Merge branch 'macos-steam' into 'master'
...
Allow macOS builds to be launched through Steam
See merge request STJr/SRB2!996
2020-07-04 16:32:16 -04:00
LJ Sonic
c3e1ee68d5
Merge branch 'fix-gif-delay' into 'next'
...
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with
See merge request STJr/SRB2!1023
2020-07-04 16:28:59 -04:00
LJ Sonic
b558c523a2
Merge branch 'fix-oldbrak-missiles2' into 'next'
...
Take 2: Fix Old Brak missiles + add pw_ignorelatch
See merge request STJr/SRB2!1006
2020-07-04 16:28:48 -04:00
James R
fb8e1f52e0
Credit Oni for CODE
2020-07-04 12:59:56 -07:00
James R
c6c773a7c1
Fuck you macro
2020-07-04 12:52:01 -07:00
James R
3554cc8b1b
Actually save the cvar name in demos
2020-07-04 12:51:07 -07:00
LJ Sonic
6ce388908b
Merge branch 'levelflat_name' into 'next'
...
Use levelflat->name instead of flatname
See merge request STJr/SRB2!1024
2020-07-04 08:46:04 -04:00
LJ Sonic
6b288c7c81
Merge branch 'make-linedef-422-smarter' into 'next'
...
Make Linedef type 422 smarter
See merge request STJr/SRB2!1014
2020-07-04 08:35:42 -04:00
lachwright
d989d57bd0
Reduce speed cut when gliding underwater
2020-07-04 19:17:38 +08:00
LJ Sonic
325867ea59
Merge branch 'jetjawsound' into 'next'
...
Jet Jaw Sounds
See merge request STJr/SRB2!1018
2020-07-04 07:09:43 -04:00
LJ Sonic
645d613cf0
Merge branch 'more-platform-fixes' into 'next'
...
More platform fixes
See merge request STJr/SRB2!999
2020-07-04 07:07:17 -04:00
LJ Sonic
ac070380c1
Merge branch 'cez3debris' into 'next'
...
New Debris for CEZ3
See merge request STJr/SRB2!1012
2020-07-04 07:00:20 -04:00
lachwright
6a7565686b
Merge remote-tracking branch 'origin/next' into knuxtweaks
2020-07-04 18:53:26 +08:00
LJ Sonic
5c61f059e8
Merge branch 'sf_nosupersprites' into 'next'
...
Add SF_NOSUPERSPRITES
See merge request STJr/SRB2!1000
2020-07-04 06:51:11 -04:00
LJ Sonic
79857ea9e8
Merge branch 'patch-1' into 'next'
...
Rename "Legacy" control scheme
See merge request STJr/SRB2!1029
2020-07-04 06:50:15 -04:00
lachwright
10b09f49c3
Add sightcheck boolean to P_RadiusAttack
...
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
Lachlan
44dfcc7b3d
Merge remote-tracking branch 'origin/next' into more-platform-fixes
2020-07-04 05:25:38 +08:00
Lachlan
ab3f5e8aff
Fix compiler warning
2020-07-04 05:25:34 +08:00
LJ Sonic
85f5698c9b
Merge branch 'dragonbomber-height' into 'next'
...
Fix Dragonbomber z positioning
See merge request STJr/SRB2!1004
2020-07-03 17:05:10 -04:00
LJ Sonic
e4b5d85f31
Merge branch 'shift-when-hiding-in-1p-menu' into 'next'
...
Tweak display of hidden items in "1 Player" menu
See merge request STJr/SRB2!1013
2020-07-03 17:04:42 -04:00
LJ Sonic
080a5acd0f
Merge branch 'ff_horizontalflip' into 'next'
...
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
See merge request STJr/SRB2!987
2020-07-03 16:56:32 -04:00
Lachlan
cd152365fa
Fix skiddust positional scaling
2020-07-04 04:30:57 +08:00
Lachlan
ee7bc779ea
P_Earthquake: Use P_RadiusAttack in favor of thinker iteration
2020-07-04 04:00:28 +08:00
Lachlan
2ceff03a15
Fix buildbot warning
2020-07-04 03:21:48 +08:00
SteelT
2d6fff5165
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
0a3b728e81
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
da537d8695
"Legacy controls" was a mistake of a name
2020-07-02 23:17:33 -04:00
Hannu Hanhi
ff9848befb
Better MF2_LINKDRAW support for OpenGL
2020-07-03 00:28:52 +03:00
lachwright
5ec234e726
Merge branch 'next' into knuxtweaks
2020-07-02 13:08:04 +08:00
Zippy_Zolton
acdac44db8
sound caption
2020-07-01 23:18:20 -05:00
James R
1071e72e62
Merge branch 'cheese' into 'next'
...
Cheese
See merge request STJr/SRB2!1028
2020-07-01 23:28:08 -04:00
James R
39e3a5f5bb
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
79bbd3606d
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