stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-20 09:51:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
11062 commits 172 branches 41 tags 280 MiB
Commit graph

11062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
3d50bef0e5 Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos
ac04853f8c Remove GrTexInfo 2020-07-06 00:35:48 -03:00
Jaime Passos
abeedc4b65 Delete hw_glide.h 2020-07-06 00:27:34 -03:00
Hannu Hanhi
b4aa5cecc1 Merge remote-tracking branch 'upstream/next' into ogl-linkdraw 2020-07-05 13:27:51 +03:00
James R
de8019f163 Merge branch 'hahaha-credits' into 'next' 
The credit

See merge request STJr/SRB2!1033
 2020-07-04 18:00:49 -04:00
LJ Sonic
9c1bee694b Merge branch 'knuxtweaks' into 'next' 
Knuckles tweaks

See merge request STJr/SRB2!1030
 2020-07-04 16:37:35 -04:00
James R
a609e52d17 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
9f69396054 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
6c61baa818 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
96bccd5f9f Credit Oni for CODE 2020-07-04 12:59:56 -07:00
James R
d9005203c7 Fuck you macro 2020-07-04 12:52:01 -07:00
James R
e741a7b3c7 Actually save the cvar name in demos 2020-07-04 12:51:07 -07:00
LJ Sonic
17616967d3 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
77e39a0fd5 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
17daf2faa2 Reduce speed cut when gliding underwater 2020-07-04 19:17:38 +08:00
LJ Sonic
cf4087a014 Merge branch 'jetjawsound' into 'next' 
Jet Jaw Sounds

See merge request STJr/SRB2!1018
 2020-07-04 07:09:43 -04:00
LJ Sonic
804ba6da9e 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
8d511ed565 Merge branch 'cez3debris' into 'next' 
New Debris for CEZ3

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
lachwright
f03addc5a7 Merge remote-tracking branch 'origin/next' into knuxtweaks 2020-07-04 18:53:26 +08:00
LJ Sonic
98c657e703 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
5ee94c8ce7 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
527e682931 Add sightcheck boolean to P_RadiusAttack 
Also now destroys Egg Guard shields, and circumstantially Minuses
 2020-07-04 18:27:06 +08:00
Lachlan
e2bdb56f97 Merge remote-tracking branch 'origin/next' into more-platform-fixes 2020-07-04 05:25:38 +08:00
Lachlan
cdb247d08f Fix compiler warning 2020-07-04 05:25:34 +08:00
LJ Sonic
3679df07aa 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
07bbebd9b0 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
6e7446dea3 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
e44d93f76b Fix skiddust positional scaling 2020-07-04 04:30:57 +08:00
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