Nev3r
ec9f727e53
Move map data load procedure to separate functions.
2019-12-12 11:16:55 +01:00
Nev3r
43cbad200c
Move loading functions around a bit and refactor the stage data allocation code.
2019-12-12 10:35:38 +01:00
Jaime Passos
ea129f701c
Fix Ploadflat closing the game with "Too many flats in level" error message
2019-12-11 22:45:47 -03:00
Tatsuru
d40359ee02
Hugging now requires being in the same Z position
...
Don't try this at home
2019-12-11 19:13:22 -06:00
Jaime Passos
e01eb19044
Sad!
2019-12-11 22:11:00 -03:00
Jaime Passos
0652ffd67f
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-12-11 21:53:47 -03:00
James R
7a59ade63d
Merge branch 'garbage' into 'master'
...
memset SERVERINFO maptitle
See merge request STJr/SRB2Internal!624
2019-12-11 19:19:29 -05:00
James R
6464df9876
Maybe I'm mistaken but this probably isn't needed
2019-12-11 16:14:06 -08:00
lachwright
8a70759e0a
Add TC_DASHMODE color shader
2019-12-12 01:27:41 +08:00
Nev3r
edfe053cc3
Treat warnings as errors; comment out unused function.
2019-12-11 16:37:41 +01:00
Jaime Passos
be13f463f0
Update r_plane.c
2019-12-11 12:36:54 -03:00
Nev3r
d34fd4b755
Epic oversight in upside-down spawn offset.
2019-12-11 15:48:44 +01:00
Jaime Passos
dedd5527da
Restore portal culling code that went gone by pure accident
2019-12-11 11:35:34 -03:00
Nev3r
222336ac0b
Oversight, do not free the data yet vres_Free() does it already at the end.
2019-12-11 15:16:56 +01:00
Nev3r
a87a9e6ff6
Remove wrappers and dupes for map lump reading, as they are no longer used.
2019-12-11 14:40:31 +01:00
Nev3r
9952bae5ee
P_MakeMapMD5() now uses virtres.
2019-12-11 14:20:08 +01:00
Nev3r
14ad3b938e
Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question.
2019-12-11 14:04:09 +01:00
Nev3r
4d86dc11a6
'prepare' mapthings using virtres in P_LevelInitStuff(). Whether 'preparing' them or not is actually necessary is another matter.
2019-12-11 13:54:15 +01:00
Nev3r
bf5a2c68d5
P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not.
2019-12-11 13:22:07 +01:00
Nev3r
854d50f479
Added 'virtual resource' mechanism for temporary memory loaded lump lists. If you can come up with a better name then I'm all ears.
2019-12-11 11:44:46 +01:00
Nev3r
d2cbdd4fb1
Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now.
2019-12-11 11:10:31 +01:00
Nev3r
584348b91e
Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead.
2019-12-11 10:13:52 +01:00
GoldenTails
07316fc5bd
Stop characters from being able to activate their abilities when doing a shield ability!
...
Fixes #61 .
2019-12-10 23:55:52 -06:00
Jaime Passos
f51253a0a8
Tilted water
2019-12-10 17:01:19 -03:00
Nev3r
ca6a7ffbb3
Fix NiGHTS bumpers height.
2019-12-10 18:53:49 +01:00
Nev3r
8466dc5813
Move mobj spawn Z calculating to a separate function.
2019-12-10 18:03:15 +01:00
Nev3r
3dfa526eea
Separate Emerald Hunt emerald spawning into another function.
2019-12-10 14:21:08 +01:00
Nev3r
6fe6db8e18
Removed seemingly redundant (and incorrect) mapthing Z load code.
...
The proper code seems to sit inside P_SpawnMapThing() and the SpawnHoop functions. Time will tell if I've actually commited an atrocity.
2019-12-09 14:05:22 +01:00
Nev3r
8ea7dd418a
Move the axis spawning code out of the mapthing read function, and read the mapthing z in the mapthing read function.
2019-12-09 13:26:31 +01:00
Jaime Passos
4d83db5bb2
Die, Apple!
2019-12-08 22:31:59 -03:00
Jaime Passos
5c02bc59db
Speed up level loading
...
Don't flush every texture just because the palette MAY have changed
2019-12-08 22:28:13 -03:00
Jaime Passos
c6769e7220
Die
2019-12-08 22:12:56 -03:00
Jaime Passos
7f58002e12
Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer
2019-12-08 21:10:48 -03:00
Jaime Passos
25464c867a
Translate the French
2019-12-08 21:10:14 -03:00
Alam Ed Arias
e91a689478
Merge branch 'master' into opengl-is-a-bad-renderer
2019-12-08 12:50:45 -05:00
Alam Ed Arias
d8eccc2921
Merge remote-tracking branch 'public/strcasestr-swap' into buildbot
2019-12-08 12:36:23 -05:00
Alam Ed Arias
1d0cd586ba
P_AddWadFile: the PK3 may not have folders
2019-12-08 12:35:21 -05:00
Alam Ed Arias
623629b04a
OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL
2019-12-08 12:33:11 -05:00
Alam Ed Arias
35168ddeae
OpenGL: yflip is used to hold more then true/false
2019-12-08 12:32:23 -05:00
Jaime Passos
d74f2a003b
HWR_FreeMipmapCache already calls HWR_FreeMipmapCache indirectly
...
(done by calling HWR_LoadTextures, which in turn calls HWR_FreeTextureCache)
2019-12-08 04:40:29 -03:00
Jaime Passos
4c808cb7e2
Actually don't even call HWR_FreeMipmapCache between levels because I feel like it's futile outside of PWAD loading
2019-12-08 04:32:25 -03:00
Jaime Passos
d8a804febc
LMFAOOOOOOOOOOOOOOOOOOOOOOOO
2019-12-08 04:15:25 -03:00
Jaime Passos
cc12496e9c
Optimize mipmaps
2019-12-08 03:23:37 -03:00
Jaime Passos
ce61b17117
Update hw_main.c
2019-12-08 02:27:51 -03:00
Jaime Passos
964978a337
Delete md2_transform
2019-12-08 02:25:53 -03:00
Jaime Passos
bc60a0a887
Make some things clearer here.
2019-12-08 01:54:03 -03:00
Jaime Passos
40b862967d
Just in case?
2019-12-07 23:55:28 -03:00
Jaime Passos
e9e0683d5e
Cleanup FreeMipmapColormap
2019-12-07 23:46:05 -03:00
James R
d5816d44f3
Use a third variable of XOR nonsense
2019-12-07 17:36:45 -08:00
James R
cadaecbfcf
memset this or the stupid masterserver (used to) show garbage bytes
...
Also for security I guess...
2019-12-07 15:47:18 -08:00
mazmazz
2a9a2c0f02
Travis yflip error
2019-12-07 14:30:51 -05:00
mazmazz
0d41a55071
Deployer fixes for 2.2.0
2019-12-07 13:56:05 -05:00
Jaime Passos
69c08f93bb
Update d_main.c
2019-12-07 11:55:53 -03:00
MascaraSnake
79b04c5872
One more asset hash change
2019-12-07 14:17:26 +01:00
toaster
0bd1399c52
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
d02648450a
Let fix that GCC warning
2019-12-06 18:12:50 -05:00
James R
53cfba1f42
Use strncpy
2019-12-06 15:09:07 -08: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
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
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
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
toaster
7bd5d291ce
Fix unlockable checklist literally hanging if any unlockables are cleared.
2019-12-05 18:40:30 +00:00
Alam Ed Arias
3120c99eeb
Fix compiling for MSVC
2019-12-05 12:38:50 -05:00
Alam Ed Arias
0ca87560ab
Fix building libpng and zlib with MSVC
2019-12-05 12:33:18 -05:00
Alam Ed Arias
f1d2968c19
Merge branch 'public_next' into private
2019-12-05 11:18:33 -05:00
Alam Ed Arias
b1571f81b1
Merge branch 'master' into next
2019-12-05 10:52:17 -05:00
Alam Ed Arias
0a24c82346
Fix building with MSVC
2019-12-05 10:51:55 -05:00
toaster
7f6c98f046
Fix clearing maps making the Tutorial option on the SP menu crash.
2019-12-05 13:42:08 +00:00
toaster
848d7ad819
Allow the NiGHTS Attack menu to have the levels selectable left-and-right-wise, just like Record Attack.
2019-12-05 11:12:35 +00:00
toaster
2b5957fd1c
Fix #457 and another bug I just realised in one fell swoop.
...
That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.
2019-12-05 09:47:29 +00:00
toaster
25eacbffb8
Make Tails' "I'll give you a hand!" bubble a hnext chain instead of a target set, which is way less likely to be clobbered in standard gameplay.
...
Should resolve both #440 and #458 , which are two sides of the same issue - target being overwritten.
2019-12-05 09:36:58 +00:00
toaster
7c7f258c2d
Another potential papersprite crash fix, but way more confident about this one.
2019-12-05 09:28:28 +00:00
lachwright
cffc6a0e46
Fix diagonal input acceleration and glide directioning in analog mode
2019-12-05 15:59:16 +08:00
lachwright
28fbdab3d4
Make signpost camera distance consistent in analog mode & don't target signpost in 2D mode
2019-12-05 12:58:44 +08:00
Jaime Passos
c0cc742fb8
Remove unnecessary function parameters from title card code
2019-12-05 01:58:19 -03:00
lachwright
fdf3944f60
Merge branch 'master' into signpost-cleanup
2019-12-05 12:37:03 +08:00
lachwright
8ddfdf2d0f
Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode
2019-12-05 12:36:25 +08:00
sphere
d1b456b893
Edit some rock crumble states to match new sprites.
2019-12-05 02:22:25 +01:00
MascaraSnake
e6f1b82cc4
Merge branch 'minusoneframes' into 'master'
...
Minus One Frames
See merge request STJr/SRB2Internal!593
2019-12-04 17:15:51 -05:00
MascaraSnake
6b344b9ddf
Merge branch 'freemipmapcolormap-momento-irmao' into 'master'
...
Fix FreeMipmapColormap yet again
See merge request STJr/SRB2Internal!597
2019-12-04 17:10:06 -05:00
MascaraSnake
a7884e479a
Merge branch 'timeoverrings' into 'master'
...
Time Over rings (resolves #446 ).
Closes #446
See merge request STJr/SRB2Internal!596
2019-12-04 17:09:32 -05:00
MascaraSnake
6928763961
Merge branch 'nullplayerslopelaunch' into 'master'
...
Fix slope launch with NULL player causing SIGSEGV.
See merge request STJr/SRB2Internal!595
2019-12-04 17:07:04 -05:00
MascaraSnake
01da9f7f16
Merge branch 'tokenultimate' into 'master'
...
Fix tokens not spawning in ultimate mode
See merge request STJr/SRB2Internal!594
2019-12-04 17:06:43 -05:00
MascaraSnake
5662f8de00
Merge branch 'credits-update' into 'master'
...
Credits update
See merge request STJr/SRB2Internal!484
2019-12-04 16:59:46 -05:00
MascaraSnake
6a811515db
Merge branch 'have_png-compile-fix' into 'master'
...
NO_PNG_LUMPS compile fix
See merge request STJr/SRB2Internal!598
2019-12-04 16:59:13 -05:00
MascaraSnake
77d446cc04
Merge branch 'spsmshgular' into 'master'
...
sfx_spsmsh (hhz spikeball) is now singular
Closes #451
See merge request STJr/SRB2Internal!599
2019-12-04 16:58:56 -05:00
toaster
fe0b92d01a
sfx_spsmsh (hhz spikeball) is now singular
2019-12-04 20:32:46 +00:00
Jaime Passos
81cfca29d8
Fix FreeMipmapColormap yet again
2019-12-04 15:50:17 -03:00
Jaime Passos
b646922967
fix Ploadflat warning
2019-12-04 15:41:29 -03:00
Jaime Passos
839251633c
fix ErrorIfPNG errors
2019-12-04 15:26:51 -03:00
toaster
e8ac1c391c
Make rings 0 in competition winner selection if you gamed or timed over, and use the MAXSCORE macro instead of a hardcoded value.
2019-12-04 17:32:47 +00:00
Alam Ed Arias
c432f86624
change from shifting bits to multi for a OLD video function marco
2019-12-04 10:43:33 -05:00
Alam Ed Arias
0751f8987a
Libs: move pngconf.h out of top level libpng source folder
2019-12-04 10:41:54 -05:00
toaster
7f82d7451d
Fix slope launch with NULL player causing SIGSEGV.
2019-12-04 12:13:27 +00:00
Steel Titanium
41210708e2
Merge branch 'fade-timeout-fix' into 'master'
...
Temporary fix for the fade timeout
See merge request STJr/SRB2Internal!592
2019-12-03 20:19:33 -05:00
toaster
c843f22a24
Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion.
2019-12-03 23:21:36 +00:00
MascaraSnake
20c1a0158d
Added Sev to the Art section of the credits
2019-12-04 00:07:56 +01:00
MascaraSnake
c2577b6eb3
Added more people to the credits and reorganized them slightly
2019-12-04 00:02:47 +01:00
MascaraSnake
602ba32ecc
A few more credits additions/adjustments
2019-12-03 22:22:48 +01:00
toaster
e75490c99d
Semi-hacky fix to R_AddSpriteDefs printing Added -1 frames in 0 sprites: if the start marker is equal to or beyond the end marker, none of r_things' for (l = startlump; l < endlump; l++) loops will run, so just assume no sprites.
...
Simply put, `W_CheckNumForFolderStartPK3` and its `End` equivalent will never return INT16_MAX for nonexistence, and I don't want to break any assumptions elsewhere by modifying those functions directly, so this is the simplest possible fix.
2019-12-03 21:05:05 +00:00
MascaraSnake
7a8d1b4d4b
Merge branch 'creditsart' into 'master'
...
New credits art + credits header support
See merge request STJr/SRB2Internal!591
2019-12-03 14:28:51 -05:00
Louis-Antoine
84e7672cca
Temporary fix for the fade timeout
2019-12-03 12:02:14 +01:00
MascaraSnake
0c048d2667
Merge branch 'tailsbotdetect' into 'master'
...
Attempt to detect Tailsbot and Sonic spawning on top of each other
See merge request STJr/SRB2Internal!584
2019-12-03 02:20:30 -05:00
MascaraSnake
f9460434f8
Merge branch 'savedatareorder' into 'master'
...
Savedata load order of operations change
See merge request STJr/SRB2Internal!583
2019-12-03 02:18:06 -05:00
MascaraSnake
c30886a47f
Merge branch 'botregrab' into 'master'
...
Allow re-grabbing Tails AI mid-flight (resolves #428 )
Closes #428
See merge request STJr/SRB2Internal!590
2019-12-03 02:17:37 -05:00
MascaraSnake
c1d5f411e0
Merge branch 'paperfixes' into 'master'
...
Nail a likely culprit in papersprite rendering resolving #427 and #375 .
Closes #427 and #375
See merge request STJr/SRB2Internal!589
2019-12-03 02:16:26 -05:00
MascaraSnake
ab400e926a
Merge branch 'emeraldfall' into 'master'
...
Fix emerald coordinate overflow in failed SS tally (resolves #421 ).
Closes #421
See merge request STJr/SRB2Internal!586
2019-12-03 02:15:47 -05:00
MascaraSnake
ba0dc5c884
Merge branch 'ideyagun' into 'master'
...
Ideyagun (resolves #406 ).
Closes #406
See merge request STJr/SRB2Internal!582
2019-12-03 02:15:26 -05:00
Alam Ed Arias
b5738620c1
Fixup compiling errors
2019-12-02 12:12:26 -05:00
lachwright
be3d7b7dcd
- Remove y coordinate from struct for credits_pics
...
- Update x coordinates for credits_pics entries
- Reorder credits_pics entries (what even was the previous order lol)
- Add zig zag graphics to credits roll
- Attempt to scale the y positions of credits graphics with the length of the credits roll
- New escape character for credits entries: \2, which centers the text and makes it yellow
- Add support for colored text to V_DrawStringAtFixed
2019-12-02 22:24:05 +08:00
toaster
2bc67bf813
Allow re-grabbing Tails AI mid-flight ( resolves #428 )
2019-12-01 13:31:33 +00:00
toaster
f21ebaea0c
Nail a likely culprit in papersprite rendering for #427 and #375 .
2019-12-01 13:21:41 +00:00
MascaraSnake
ae2594e5ce
Merge branch 'metalfix' into 'master'
...
Boss Scream fix
See merge request STJr/SRB2Internal!581
2019-12-01 02:26:24 -05:00
