mazmazz
|
126dbc4a82
|
Deployer fixes for 2.2.0
|
2019-12-07 13:56:05 -05:00 |
|
Jaime Passos
|
44daeb340e
|
Update d_main.c
|
2019-12-07 11:55:53 -03:00 |
|
MascaraSnake
|
c2cd1adb8b
|
One more asset hash change
|
2019-12-07 14:17:26 +01:00 |
|
toaster
|
3b7b788e4c
|
Revert paperprojection, but keep it as a #define in case someone fixes it in a patch.
|
2019-12-07 10:22:10 +00:00 |
|
Alam Ed Arias
|
247ef908f0
|
Let fix that GCC warning
|
2019-12-06 18:12:50 -05:00 |
|
MascaraSnake
|
1c4ed89ab6
|
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal
|
2019-12-07 00:12:10 +01:00 |
|
MascaraSnake
|
c0bc5f7c5a
|
Minor changes to the readme
|
2019-12-07 00:11:57 +01:00 |
|
James R
|
c3c3fac1a8
|
Use strncpy
|
2019-12-06 15:09:07 -08:00 |
|
MascaraSnake
|
136a4a8e15
|
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
|
e31a10df30
|
Change versionstring to 2.2.0
|
2019-12-06 23:47:05 +01:00 |
|
MascaraSnake
|
7f0bb0686d
|
Updated MD5 hashes
|
2019-12-06 23:43:54 +01:00 |
|
MascaraSnake
|
3ad7f9e445
|
Merge branch 'master' into nondevelop
|
2019-12-06 23:23:01 +01:00 |
|
MascaraSnake
|
7a9151a969
|
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
|
19286d33f9
|
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
|
147960f4db
|
Correct comment
|
2019-12-06 17:10:14 -05:00 |
|
toaster
|
74279862c3
|
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.
|
2019-12-06 22:06:35 +00:00 |
|
lachwright
|
97b72422c4
|
Lengthen credits for msuic parity
|
2019-12-07 05:59:26 +08:00 |
|
MascaraSnake
|
32f76e8c65
|
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
|
fffd385151
|
Merge branch 'datestuff' into 'master'
Date stuff
See merge request STJr/SRB2Internal!618
|
2019-12-06 16:10:36 -05:00 |
|
MascaraSnake
|
313afd1ea3
|
Merge branch 'signpost-cleanup' into 'master'
Signpost fixes
See merge request STJr/SRB2Internal!602
|
2019-12-06 15:58:46 -05:00 |
|
toaster
|
c5a9a0c246
|
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
|
23e9a3d19c
|
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
|
4cc7bd7a16
|
get lua_blockmaplib.c too
|
2019-12-06 15:27:20 -05:00 |
|
Steel Titanium
|
adbdf688e7
|
Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff
|
2019-12-06 15:23:02 -05:00 |
|
Steel Titanium
|
7ec6757ecd
|
Fix copy+paste goof
|
2019-12-06 15:21:41 -05:00 |
|
Jaime Passos
|
7d2df40988
|
Update r_patch.h
|
2019-12-06 17:07:57 -03:00 |
|
Jaime Passos
|
f715d9062b
|
Update r_patch.c
|
2019-12-06 17:05:36 -03:00 |
|
MascaraSnake
|
dc3d68bf22
|
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
|
f36fa64b57
|
Not dealing with size_t mess with SDL code
|
2019-12-06 14:42:47 -05:00 |
|
MascaraSnake
|
44b6cc1056
|
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
|
4f0c201e20
|
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
|
a5cdb0a4b3
|
Update copyright date on source files
|
2019-12-06 13:49:42 -05:00 |
|
Alam Ed Arias
|
25806d93e0
|
OpenGL cast to float, not store in double
|
2019-12-06 13:45:11 -05:00 |
|
lachwright
|
ea20a1a118
|
Fix whitespace issues from when I was new to this shit
|
2019-12-07 02:31:31 +08:00 |
|
lachwright
|
415b6663c9
|
Actually fix F12 issues
|
2019-12-07 02:27:48 +08:00 |
|
Steel Titanium
|
f80b5cf8c9
|
Update DLL-README.txt
|
2019-12-06 13:22:03 -05:00 |
|
lachwright
|
e2d4c9e8a7
|
Hopefully fix F12 issues
|
2019-12-07 01:52:40 +08:00 |
|
toaster
|
9104fe85b9
|
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
|
b36de5f6b5
|
Make modid 18 to match Rob's work.
|
2019-12-06 17:23:55 +00:00 |
|
toaster
|
419d696072
|
Make modversion 40 to match Rob's work.
|
2019-12-06 17:19:42 +00:00 |
|
toaster
|
67d8b291bb
|
* 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
|
8aa0ba0a70
|
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
|
47dfb2046b
|
Make Buggles spawn immediately breathable bubbles
|
2019-12-06 16:29:52 +08:00 |
|
MascaraSnake
|
351677e74a
|
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
|
110351521c
|
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
|
460f832932
|
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
|
2f1e17da56
|
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
|
1f5ed0884c
|
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
|
21aa6fe3e7
|
Merge branch 'tailsbubblefix' into 'master'
Tails Bubble Fix
See merge request STJr/SRB2Internal!606
|
2019-12-05 16:20:24 -05:00 |
|
MascaraSnake
|
5e8f7886cd
|
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 |
|