c6253bb6f9
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
d9558fb724
Merge branch 'atz-hazards' into 'master'
...
Azure Temple Zone hazards, round 2
See merge request STJr/SRB2Internal!437
2019-11-12 18:05:44 -05:00
c5ea20a699
Merge branch 'metalrecording' into 'master'
...
Metal battle, recording, and playback improvements
Closes #283 and #215
See merge request STJr/SRB2Internal!431
2019-11-12 17:49:53 -05:00
5729ba3cd2
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
cc499515da
Update ZB config for Glaregoyle and Buggle object names, and Glaregoyle sprite name.
2019-11-12 15:57:23 -05:00
66123b8165
Merge branch 'internal-md3-vanilla-c' into 'master'
...
Internal MD3 merge 2 good riddance glBegin
See merge request STJr/SRB2Internal!362
2019-11-12 15:44:20 -05:00
17c302e4a3
Merge branch 'texture-flats-optimization' into 'master'
...
Texture flat optimization
Closes #257
See merge request STJr/SRB2Internal!405
2019-11-12 15:42:04 -05:00
17013bf1b7
Merge branch 'jingle-fixes' into 'master'
...
Fix some jingle resuming behavior when also changing base level music
See merge request STJr/SRB2Internal!415
2019-11-12 15:41:53 -05:00
bffa281d91
Merge branch 'titlemap-on-connect' into 'master'
...
Render title map on connecting to server screen too (closes #166 )
Closes #166
See merge request STJr/SRB2Internal!416
2019-11-12 15:41:07 -05:00
b04452f7de
Merge branch 'nonightsbot2' into 'master'
...
Properly fix bot showing up in NiGHTS stages (resolves #261 for real).
Closes #261
See merge request STJr/SRB2Internal!417
2019-11-12 15:41:01 -05:00
6b567bfb5c
Merge branch 'dashmodecut' into 'master'
...
Dashmode polish
Closes #266
See merge request STJr/SRB2Internal!418
2019-11-12 15:40:46 -05:00
857dbd8488
Merge branch 'knuxstuff' into 'master'
...
Knuckles changes: the fixes
See merge request STJr/SRB2Internal!428
2019-11-12 15:40:15 -05:00
4e6513b583
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-11 14:05:03 -03:00
3580977eb3
Merge branch 'elementalgoop' into 'master'
...
THZ goop and Elemental (Resolve #260 , I hope?)
Closes #260
See merge request STJr/SRB2Internal!419
2019-11-11 11:42:19 -05:00
049e599f2e
Merge branch 'spinny-sign' into 'master'
...
Papersprite end signpost
See merge request STJr/SRB2Internal!442
2019-11-11 11:39:56 -05:00
4cdabb2aaf
Merge branch 'fuck-globals' into 'master'
...
I_Error if memory allocation size overflows
See merge request STJr/SRB2Internal!426
2019-11-11 11:38:07 -05:00
aa5a3a46e8
Merge branch 'gamedata-param' into 'master'
...
Custom gamedata parameter
See merge request STJr/SRB2Internal!423
2019-11-11 11:36:53 -05:00
41b95437da
Merge branch 'rvz-cleanup' into 'master'
...
RVZ1 lag reduction
See merge request STJr/SRB2Internal!445
2019-11-11 11:29:53 -05:00
d1e800e1a8
Merge branch 'inflivesfix' into 'master'
...
Prevent infinite lives rollover to extremely negative numbers.
See merge request STJr/SRB2Internal!446
2019-11-11 11:25:20 -05:00
2edb852f2c
Merge branch 'pmomztweak' into 'master'
...
Fix pmomz (resolves #64!?)
Closes #64
See merge request STJr/SRB2Internal!447
2019-11-11 11:24:01 -05:00
c85f471911
Merge branch 'kill-these-please' into 'master'
...
Kill the new compiler errors (since GCC 9?)
See merge request STJr/SRB2Internal!448
2019-11-11 11:23:16 -05:00
afd461a860
Merge branch 'skin-wads-again' into 'master'
...
So I don't know what a skin wad is... (closes #282 )
Closes #282
See merge request STJr/SRB2Internal!449
2019-11-11 11:22:30 -05:00
7c7fc35ec5
Merge branch 'deathlaunch' into 'master'
...
Fix players being launched by slopes and pmomz when dying.
See merge request STJr/SRB2Internal!452
2019-11-11 11:22:12 -05:00
2e1e9b13d9
Merge branch 'magicalmovingfire' into 'master'
...
Magical moving fire
Closes #278
See merge request STJr/SRB2Internal!453
2019-11-11 11:18:20 -05:00
f79da2fb3f
Merge branch 'walltransfermovev2' into 'master'
...
Let players roll AND move after spinning off a wall transfer
Closes #274
See merge request STJr/SRB2Internal!456
2019-11-11 11:17:32 -05:00
c2d09ac4e4
Merge branch 'new-title-multi-res' into 'master'
...
2.2 Title Screen
See merge request STJr/SRB2Internal!439
2019-11-11 08:46:36 -05:00
8e2cb88576
Lach wanted to do this, but we might have a release candidate before he gets back, so did it myself.
...
Make the wall transfer while spinning PF_SPINNING|PF_THOKKED. This:
* Prevents PF_MULTIABILITY players from using their ability after a wall transfer.
* Has a more specialised case which allows players to roll after having wall-transferred while spinning.
* (side effect) allows modders to apply PF_THOKKED any time for more controllable spinning.
2019-11-09 17:49:26 +00:00
98b08580f5
Fix broken dehacked table.
2019-11-09 17:17:05 +00:00
aaddfada50
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into spinny-sign
2019-11-09 16:44:06 +00:00
26e534304d
Signed/unsigned comparison error
2019-11-09 16:43:44 +00:00
2f22547889
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
068c712824
Shut up
2019-11-09 17:24:10 +01:00
aa20e304cf
Fix silly typo :P
2019-11-09 15:46:34 +01:00
773f2efdd9
minor fixes
2019-11-09 01:45:00 -03:00
b88a37949e
Use REDFLR for missing flats
2019-11-09 00:08:22 -03:00
249cf5c8ad
fix invisible planes, fix flat animation
2019-11-08 23:42:15 -03:00
ae838d4879
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
2019-11-08 23:01:29 -03:00
809f79c951
make hwrender compile
2019-11-08 22:58:41 -03:00
d8b14e54c9
Resolve #278 .
2019-11-08 21:43:39 +00:00
24e5ccec0b
Fix players being launched by slopes and pmomz when dying.
2019-11-08 19:40:40 +00:00
3734eab7b6
Add signpost camera (and fix a typo whoops)
2019-11-09 00:47:51 +08:00
bb182b9ec7
Resolve #283 .
2019-11-08 13:58:53 +00:00
292791ffaf
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
2019-11-08 13:02:32 +00:00
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
bd9878eb48
Merge branch 'master' into spinny-sign
2019-11-08 19:59:08 +08:00
6ac613b2ca
Move this "skin wads" check so that PK3 can work with it
2019-11-07 18:27:06 -08:00
99cd5161be
Also allocate mipmap for MD2
2019-11-07 18:04:53 -08:00
d2a7a87c7f
Fix nonpacked to packed cast for OpenGL
2019-11-07 16:30:29 -08:00
ceb8d298c2
Fix misaligned pointers
2019-11-07 16:29:58 -08:00
7a770fa63c
Lol it's the wrong union!
2019-11-07 16:22:25 -08:00
Jaime Passos