toaster
083f72eb31
Signed/unsigned comparison error
2019-11-09 16:43:44 +00:00
toaster
3b699f92a3
Merge branch 'fix-players-typos' into 'master'
...
Fix silly typo :P
See merge request STJr/SRB2Internal!454
2019-11-09 11:29:18 -05:00
Louis-Antoine
99b89b1ae3
Shut up
2019-11-09 17:24:10 +01:00
Louis-Antoine
7a9bb54a5d
Fix silly typo :P
2019-11-09 15:46:34 +01:00
Jaime Passos
bb5ac7ce61
minor fixes
2019-11-09 01:45:00 -03:00
Jaime Passos
fbe850e63e
Use REDFLR for missing flats
2019-11-09 00:08:22 -03:00
Jaime Passos
911238945c
fix invisible planes, fix flat animation
2019-11-08 23:42:15 -03:00
Jaime Passos
a1339b60ad
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
Jaime Passos
c7c6a0d5b3
make hwrender compile
2019-11-08 22:58:41 -03:00
Jaime Passos
4a93426233
Avoid running setter metamethods when not appropriate to do so
2019-11-08 22:13:50 -03:00
toaster
36a80c95c1
Resolve #278 .
2019-11-08 21:43:39 +00:00
toaster
65655d0377
Fix players being launched by slopes and pmomz when dying.
2019-11-08 19:40:40 +00:00
lachwright
2f4528663c
Add signpost camera (and fix a typo whoops)
2019-11-09 00:47:51 +08:00
toaster
da041e1224
Minor addition: Get in the way less when doing Record Attack stuff in DEVELOP builds. (Can revert before this branch is merged, but was necessary to test...)
2019-11-08 15:48:11 +00:00
toaster
2663c79d21
STOP THE CLOCK linedef exectutor!
...
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.
Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
toaster
ac196768aa
Resolve #283 .
2019-11-08 13:58:53 +00:00
toaster
a480b05c6b
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
2019-11-08 13:02:32 +00:00
lachwright
ea02042bae
Add support for custom sign color with var2 (shortcut for requests I sometimes got from character spriters in 2.1, e.g. neon green Pointy Sonic using a purple sign)
2019-11-08 20:09:12 +08:00
lachwright
46016b52e9
Merge branch 'master' into spinny-sign
2019-11-08 19:59:08 +08:00
Jaime Passos
8684507e8a
finish lua spriteinfo :]
2019-11-07 23:42:14 -03:00
James R
97c270d0a6
Move this "skin wads" check so that PK3 can work with it
2019-11-07 18:27:06 -08:00
James R
e255c340f0
Also allocate mipmap for MD2
2019-11-07 18:04:53 -08:00
James R
fd74f1848c
Fix nonpacked to packed cast for OpenGL
2019-11-07 16:30:29 -08:00
James R
8e5e4bfd08
Fix misaligned pointers
2019-11-07 16:29:58 -08:00
James R
50b0993e80
Lol it's the wrong union!
2019-11-07 16:22:25 -08:00
James R
7c0d5b3bcf
There's some whitespace...
2019-11-07 14:56:42 -08:00
James R
1f166741e2
Merge branch 'intermission-buffer' into 'master'
...
Restore the last gameplay frame while on the intermission screen
See merge request STJr/SRB2Internal!444
2019-11-07 17:53:36 -05:00
James R
91c759ad9f
Merge branch 'recordattack-menu-draw-fix' into 'master'
...
Record attack fixes
See merge request STJr/SRB2Internal!441
2019-11-07 17:53:03 -05:00
James R
7b3b89240a
Merge branch 'fix-nopng-warnings' into 'master'
...
Fix warnings when NOPNG=1
See merge request STJr/SRB2Internal!432
2019-11-07 17:52:31 -05:00
James R
b9a3f79f25
Merge branch 'fix-uppercase-in-intro-fades' into 'master'
...
Fix some intro fades displaying text in all-caps
See merge request STJr/SRB2Internal!429
2019-11-07 17:52:17 -05:00
James R
a905025354
Merge branch 'lotsacontinues' into 'master'
...
Lotsa Continues (resolves #264 )
Closes #264
See merge request STJr/SRB2Internal!422
2019-11-07 17:52:01 -05:00
James R
fa1f335e1f
Merge branch 'secrets-charsel-music-fix' into 'master'
...
Fix char select music not playing in secrets menu
Closes #272
See merge request STJr/SRB2Internal!421
2019-11-07 17:51:38 -05:00
James R
e8de2c39c6
Better account for the uninitialised signcolor
2019-11-07 14:44:42 -08:00
James R
d87fd3842d
Whitespace
2019-11-07 14:15:57 -08:00
James R
6ae6089343
That's a lot of whitespace
2019-11-07 13:42:54 -08:00
James R
85e3b3999b
var2 unused, so remove it; signcolor can be unset
2019-11-07 13:05:50 -08:00
James R
a2ca74b688
Declarations after Lua calls
2019-11-07 13:02:33 -08:00
Jaime Passos
5b758fe21c
fix accessing spriteinfo[] with a string as a key
2019-11-07 14:27:45 -03:00
toaster
9196e0905a
Fix pmomz being set to 0 in the wrong place. (P_PlayerAfterThink is after every moving sector has changed its height, while P_MovePlayer is before it...)
2019-11-07 17:10:59 +00:00
toaster
f75d221b0f
Prevent infinite lives rollover to extremely negative numbers. (Discovered while messing around with pandora's box recently.)
2019-11-07 14:06:27 +00:00
lachwright
47508ea7f8
Reduce RVZ particle spawns when no players are in proximity
2019-11-07 16:00:44 +08:00
Jaime Passos
2897001d7f
spriteinfo lua support
2019-11-07 03:11:16 -03:00
Jaime Passos
7f4df99b2d
Hopefully the last time this week I'll ever touch these files
2019-11-06 20:41:55 -03:00
Jaime Passos
532c7dd52d
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-06 19:25:38 -03:00
lachwright
c9dd2d3b93
WIP update to latest version of Lua script, halted because script inconsistencies still exist
2019-11-06 13:59:53 +08:00
lachwright
65a0db7b31
Merge branch 'master' into cobalt-ai
2019-11-06 13:41:18 +08:00
Jaime Passos
135c841056
I guess I'll have to do at least SOMETHING about OpenGL
2019-11-05 17:35:16 -03:00
Jaime Passos
db9a8b4b94
Restore the last gameplay frame while on the intermission screen
2019-11-05 17:04:57 -03:00
toaster
1082b3d7a4
Better comments for musicdef struct
2019-11-05 19:50:49 +00:00
toaster
a8169e3844
Sound test is cool now!
...
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif
* Port MUSICDEFs from Kart.
* Safe to modify without modifying game, so we can put it in music.dta eventually.
* "Title", "AltTitle", "Authors" fields are self-evident.
* "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
* "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
* Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
* Now called "V_DrawStretchyFixedPatch".
* "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
* Available to Lua under v.drawStretched!
* Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.
Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
2019-11-05 16:23:46 +00:00