Commit graph

8111 commits

Author SHA1 Message Date
Jaime Passos
249cf5c8ad fix invisible planes, fix flat animation 2019-11-08 23:42:15 -03:00
Jaime Passos
ae838d4879 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-08 23:01:29 -03:00
Jaime Passos
809f79c951 make hwrender compile 2019-11-08 22:58:41 -03:00
Jaime Passos
5f4d6c4545 Avoid running setter metamethods when not appropriate to do so 2019-11-08 22:13:50 -03:00
toaster
d8b14e54c9 Resolve #278. 2019-11-08 21:43:39 +00:00
toaster
24e5ccec0b Fix players being launched by slopes and pmomz when dying. 2019-11-08 19:40:40 +00:00
lachwright
3734eab7b6 Add signpost camera (and fix a typo whoops) 2019-11-09 00:47:51 +08:00
toaster
a82902a378 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
d8ad0b4eaa 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
bb182b9ec7 Resolve #283. 2019-11-08 13:58:53 +00:00
toaster
292791ffaf Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 2019-11-08 13:02:32 +00:00
lachwright
8203c6ae90 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
bd9878eb48 Merge branch 'master' into spinny-sign 2019-11-08 19:59:08 +08:00
Jaime Passos
c4d7fe7c5a finish lua spriteinfo :] 2019-11-07 23:42:14 -03:00
James R
6ac613b2ca Move this "skin wads" check so that PK3 can work with it 2019-11-07 18:27:06 -08:00
James R
99cd5161be Also allocate mipmap for MD2 2019-11-07 18:04:53 -08:00
James R
d2a7a87c7f Fix nonpacked to packed cast for OpenGL 2019-11-07 16:30:29 -08:00
James R
ceb8d298c2 Fix misaligned pointers 2019-11-07 16:29:58 -08:00
James R
7a770fa63c Lol it's the wrong union! 2019-11-07 16:22:25 -08:00
James R
b157c21a35 There's some whitespace... 2019-11-07 14:56:42 -08:00
James R
d9a54a6b61 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
e5f3863708 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
184a754c2e 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
ad4c55c10b 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
dcfd088aef 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
546f313616 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
9f24ef25bf Better account for the uninitialised signcolor 2019-11-07 14:44:42 -08:00
James R
ed94549a37 Whitespace 2019-11-07 14:15:57 -08:00
James R
872e662618 That's a lot of whitespace 2019-11-07 13:42:54 -08:00
James R
fff38da832 var2 unused, so remove it; signcolor can be unset 2019-11-07 13:05:50 -08:00
James R
be7dcccb71 Declarations after Lua calls 2019-11-07 13:02:33 -08:00
Jaime Passos
23d89bec1d fix accessing spriteinfo[] with a string as a key 2019-11-07 14:27:45 -03:00
toaster
f11fc92fd7 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
d2c6d6ad73 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
c43551384d Reduce RVZ particle spawns when no players are in proximity 2019-11-07 16:00:44 +08:00
Jaime Passos
f739956e89 spriteinfo lua support 2019-11-07 03:11:16 -03:00
Jaime Passos
e78999549b Hopefully the last time this week I'll ever touch these files 2019-11-06 20:41:55 -03:00
Jaime Passos
7ad997543d Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-06 19:25:38 -03:00
lachwright
800052a746 WIP update to latest version of Lua script, halted because script inconsistencies still exist 2019-11-06 13:59:53 +08:00
lachwright
00361d30d8 Merge branch 'master' into cobalt-ai 2019-11-06 13:41:18 +08:00
Jaime Passos
6d024b7124 I guess I'll have to do at least SOMETHING about OpenGL 2019-11-05 17:35:16 -03:00
Jaime Passos
ed967f077c Restore the last gameplay frame while on the intermission screen 2019-11-05 17:04:57 -03:00
toaster
0a4d0ecc5c Better comments for musicdef struct 2019-11-05 19:50:49 +00:00
toaster
5f8671b100 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
Jaime Passos
044d3fd325 Update hw_main.c 2019-11-05 12:31:50 -03:00
Jaime Passos
5ebb90cdd6 tweak fade colormaps just a little bit 2019-11-05 12:28:01 -03:00
Jaime Passos
00d76bd9ef fix fades for real 2019-11-05 12:10:42 -03:00
Jaime Passos
f057c6eef8 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-05 11:22:19 -03:00
Jaime Passos
4ff769704a function renaming 2019-11-05 10:28:19 -03:00
Jaime Passos
55c6c4f5fe Attempt to fix sky dome 2019-11-04 14:36:12 -03:00