stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
9874 commits 172 branches 41 tags 280 MiB
Commit graph

9874 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias
d02648450a Let fix that GCC warning 2019-12-06 18:12:50 -05:00
MascaraSnake
0768032a43 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal 2019-12-07 00:12:10 +01:00
MascaraSnake
4dde4c6d07 Minor changes to the readme 2019-12-07 00:11:57 +01:00
James R
53cfba1f42 Use strncpy 2019-12-06 15:09:07 -08:00
MascaraSnake
c33d163c00 Merge branch 'nondevelop' into 'master' 
Get 2.2(.0) release ready

Closes #461

See merge request STJr/SRB2Internal!615
 2019-12-06 17:47:32 -05:00
MascaraSnake
0d22970c78 Change versionstring to 2.2.0 2019-12-06 23:47:05 +01:00
MascaraSnake
f6563c85ed Updated MD5 hashes 2019-12-06 23:43:54 +01:00
MascaraSnake
bf477c6ed4 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
MascaraSnake
239242f513 Merge branch 'stretch-credits' into 'master' 
Lengthen credits for msuic parity

See merge request STJr/SRB2Internal!620
 2019-12-06 17:19:17 -05:00
MascaraSnake
78de32b623 Merge branch 'creditweak' into 'master' 
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.

See merge request STJr/SRB2Internal!621
 2019-12-06 17:18:54 -05:00
Steel Titanium
5f9f255f77
Correct comment 2019-12-06 17:10:14 -05:00
toaster
66bd864592 Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. 2019-12-06 22:06:35 +00:00
lachwright
8f2d81ec74 Lengthen credits for msuic parity 2019-12-07 05:59:26 +08:00
MascaraSnake
a0ebb32912 Merge branch 'introskiptext' into 'master' 
Add "Press ENTER to skip..." text to the intro's first scene

See merge request STJr/SRB2Internal!619
 2019-12-06 16:48:29 -05:00
MascaraSnake
a3549cc8f2 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
MascaraSnake
f3fd5a50cb Merge branch 'signpost-cleanup' into 'master' 
Signpost fixes

See merge request STJr/SRB2Internal!602
 2019-12-06 15:58:46 -05:00
toaster
674fcd7923 Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P 2019-12-06 20:50:41 +00:00
MascaraSnake
f4c89c2dac Merge branch 'analogfixes' into 'master' 
Small analog mode fixes

See merge request STJr/SRB2Internal!604
 2019-12-06 15:32:10 -05:00
Steel Titanium
f304931ac4
get lua_blockmaplib.c too 2019-12-06 15:27:20 -05:00
Steel Titanium
86cd363d16
Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff 2019-12-06 15:23:02 -05:00
Steel Titanium
f02418e70c
Fix copy+paste goof 2019-12-06 15:21:41 -05:00
Jaime Passos
fcc4427de6 Update r_patch.h 2019-12-06 17:07:57 -03:00
Jaime Passos
c4518cce9d Update r_patch.c 2019-12-06 17:05:36 -03:00
MascaraSnake
201cdef381 Merge branch 'f12fix' into 'master' 
Fix F12 issues

Closes #356 and #377

See merge request STJr/SRB2Internal!616
 2019-12-06 15:01:28 -05:00
Alam Ed Arias
1f183e1c1f Not dealing with size_t mess with SDL code 2019-12-06 14:42:47 -05:00
MascaraSnake
e105c2f749 Merge branch 'undo_double' into 'master' 
OpenGL cast to float, not store in double

See merge request STJr/SRB2Internal!617
 2019-12-06 14:28:41 -05:00
Jaime Passos
d7bfe7d652 Merge branch 'lt-extraneous-parameters' into 'master' 
Remove unnecessary function parameters from title card code

See merge request STJr/SRB2Internal!603
 2019-12-06 14:22:39 -05:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias
f576e61753 OpenGL cast to float, not store in double 2019-12-06 13:45:11 -05:00
lachwright
2e77970526 Fix whitespace issues from when I was new to this shit 2019-12-07 02:31:31 +08:00
lachwright
4a26aec031 Actually fix F12 issues 2019-12-07 02:27:48 +08:00
Steel Titanium
e8f634e99a
Update DLL-README.txt 2019-12-06 13:22:03 -05:00
lachwright
e7574957bc Hopefully fix F12 issues 2019-12-07 01:52:40 +08:00
toaster
6e8299f39d Update comments in the config on when main assets/patch.pk3 hashes have been updated (I know MS is going to update the hashes again later, but this'll still be valid to have done then). 2019-12-06 17:38:23 +00:00
toaster
fd6ecb4425 Make modid 18 to match Rob's work. 2019-12-06 17:23:55 +00:00
toaster
1684cf76bd Make modversion 40 to match Rob's work. 2019-12-06 17:19:42 +00:00
toaster
9e38af7421 * Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461). 
* Update md5s.
* Update modversion.

TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
 2019-12-06 17:14:51 +00:00
MascaraSnake
0672db9e44 Merge branch 'bugglebop' into 'master' 
Make Buggles spawn immediately breathable bubbles

See merge request STJr/SRB2Internal!613
 2019-12-06 04:21:39 -05:00
lachwright
c4f48ee979 Make Buggles spawn immediately breathable bubbles 2019-12-06 16:29:52 +08:00
MascaraSnake
c468ae5239 Merge branch 'rockcrumblefix' into 'master' 
Edit some rock crumble states to match new sprites.

See merge request STJr/SRB2Internal!601
 2019-12-05 17:10:34 -05:00
MascaraSnake
69da1a7733 Merge branch 'perfectra' into 'master' 
Record Attack perfect bonus stuff

Closes #457

See merge request STJr/SRB2Internal!607
 2019-12-05 17:02:38 -05:00
MascaraSnake
bbc5d33266 Merge branch 'notutclear' into 'master' 
Fix clearing maps/unlockables causing crashes and hangs.

See merge request STJr/SRB2Internal!609
 2019-12-05 17:02:10 -05:00
MascaraSnake
87843365fc Merge branch 'nightslevsel' into 'master' 
NiGHTS Attack left-right level selection

See merge request STJr/SRB2Internal!608
 2019-12-05 16:53:21 -05:00
MascaraSnake
6393542dc3 Merge branch 'wordwrapfix' into 'master' 
Fix V_WordWrap and the new additional text colour codes.

See merge request STJr/SRB2Internal!612
 2019-12-05 16:32:30 -05:00
MascaraSnake
adfbf3630c Merge branch 'tailsbubblefix' into 'master' 
Tails Bubble Fix

See merge request STJr/SRB2Internal!606
 2019-12-05 16:20:24 -05:00
MascaraSnake
114753e2fe Merge branch 'paperfix2' into 'master' 
Another potential papersprite crash fix

Closes #456

See merge request STJr/SRB2Internal!605
 2019-12-05 16:19:33 -05:00
Alam Ed Arias
545410bcae Merge branch 'MSVC_fixes' into 'master' 
Msvc fixes

See merge request STJr/SRB2Internal!610
 2019-12-05 15:51:59 -05:00
Alam Ed Arias
c0ec90901e frameFrame is unsigned, let set it to 0xFF 2019-12-05 15:50:44 -05:00
toaster
b2e9e8fb18 Fix V_WordWrap and the new additional text colour codes. 2019-12-05 19:43:37 +00:00
Jaime Passos
7765dd538c Merge remote-tracking branch 'origin/master' into wipes2 2019-12-05 16:26:50 -03:00