Jaime Passos
|
d95a93b537
|
Merge remote-tracking branch 'origin/master' into f_wipes
|
2019-11-14 19:57:51 -03:00 |
|
MascaraSnake
|
07ea748d96
|
Merge branch 'soundsystemfix' into 'master'
Sound system startup fix
Closes #281
See merge request STJr/SRB2Internal!465
|
2019-11-14 17:50:41 -05:00 |
|
MascaraSnake
|
8f6890025c
|
Merge branch 'secretstuff' into 'master'
The letter
See merge request STJr/SRB2Internal!438
|
2019-11-14 17:49:23 -05:00 |
|
MascaraSnake
|
3352f914d7
|
Merge branch 'rotsprite_i' into 'master'
Sprite rotation (resolves #183)
Closes #183
See merge request STJr/SRB2Internal!430
|
2019-11-14 14:58:13 -05:00 |
|
MascaraSnake
|
89f1e1ce61
|
Merge branch 'clearbans-please' into 'master'
Write empty file on clearbans
See merge request STJr/SRB2Internal!464
|
2019-11-14 14:35:03 -05:00 |
|
toaster
|
15da6c153a
|
Woops, condition was accidentially inverted... but also I decided this looks nicer instead.
|
2019-11-14 19:09:17 +00:00 |
|
toaster
|
278ddcf770
|
Merge branch 'rotsprite_i' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rotsprite_toast
|
2019-11-14 17:15:34 +00:00 |
|
Jaime Passos
|
8506d420a6
|
Optimise
|
2019-11-14 14:12:36 -03:00 |
|
toaster
|
afe28b0a0a
|
* Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward).
* Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
|
2019-11-14 17:03:02 +00:00 |
|
Jaime Passos
|
10d1b63ff2
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-14 12:49:03 -03:00 |
|
Jaime Passos
|
cb4820c505
|
Oh. Sorry.
|
2019-11-14 12:42:45 -03:00 |
|
Jaime Passos
|
4292c5fc0b
|
Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea.
|
2019-11-14 12:27:22 -03:00 |
|
toaster
|
261041dc69
|
Resolve #281. (Might have problems with non-SDL interfaces, but definitely good for what we're shipping with.)
|
2019-11-14 14:19:13 +00:00 |
|
James R
|
b38a1ec313
|
Save bans when cleared too
(Why doesn't it work for I_Quit?)
|
2019-11-13 17:37:53 -08:00 |
|
MascaraSnake
|
1f7e5aa150
|
Minor capitalization fix in ZB config
|
2019-11-13 21:07:06 +01:00 |
|
MascaraSnake
|
14477748be
|
Merge branch 'stopclock' into 'master'
Stop the clock!
See merge request STJr/SRB2Internal!450
|
2019-11-13 14:39:59 -05:00 |
|
MascaraSnake
|
7cfc7b38c5
|
Merge branch 'forceskin_bs' into 'master'
MP Charsel menu fixes
See merge request STJr/SRB2Internal!457
|
2019-11-13 14:00:11 -05:00 |
|
MascaraSnake
|
750e826310
|
Merge branch 'skinusablua' into 'master'
Skin UsabLua
See merge request STJr/SRB2Internal!458
|
2019-11-13 13:59:36 -05:00 |
|
MascaraSnake
|
1d7ce8d955
|
Merge branch 'radiomode2' into 'master'
Radio Mode fixes
See merge request STJr/SRB2Internal!459
|
2019-11-13 13:58:26 -05:00 |
|
MascaraSnake
|
8fe0cb91eb
|
Merge branch 'revert-96aa11c8' into 'master'
Update libs (revert revert revert buffalo buffalo buffalo)
See merge request STJr/SRB2Internal!436
|
2019-11-13 13:56:34 -05:00 |
|
MascaraSnake
|
510f36fbdf
|
Merge branch 'map-by-name' into 'master'
New map command
See merge request STJr/SRB2Internal!424
|
2019-11-13 13:45:36 -05:00 |
|
Jaime Passos
|
9caf98aa0b
|
nevermind
|
2019-11-13 13:20:55 -03:00 |
|
Jaime Passos
|
69fe096140
|
reset rollangle
|
2019-11-13 13:03:02 -03:00 |
|
Jaime Passos
|
c51e116c7d
|
actually,
|
2019-11-13 13:00:57 -03:00 |
|
Jaime Passos
|
fc3edc3558
|
make S_PLAY_NIGHTS_PULL use A_RollAngle
|
2019-11-13 12:57:22 -03:00 |
|
Jaime Passos
|
a9183b474b
|
rename rollaxis to rotaxis
|
2019-11-13 12:47:30 -03:00 |
|
Jaime Passos
|
b54f6181c3
|
Rotation axis (will rename internally later)
|
2019-11-13 12:36:44 -03:00 |
|
toaster
|
a7f2931b47
|
Update SFX definition to credit VAdaPEGA specifically, given we've made most credits more specific now too.
|
2019-11-13 15:02:06 +00:00 |
|
toaster
|
7b640bc81e
|
* Prevent (extremely unlikely) wraparound of patch frame calculation for the epynomous Radio (sigsegv prevention).
* Use thinstring for Authors field on the screen.
|
2019-11-13 13:44:00 +00:00 |
|
MascaraSnake
|
d591554a5d
|
Merge branch 'radiomode' into 'master'
Radio mode
See merge request STJr/SRB2Internal!443
|
2019-11-13 04:16:38 -05:00 |
|
James R
|
c9aad2d186
|
Warn if the first argument is an option
|
2019-11-12 18:29:42 -08:00 |
|
James R
|
46fbed8b71
|
Get map name from multiple arguments
(This means you don't need quoting.)
|
2019-11-12 17:42:54 -08:00 |
|
Jaime Passos
|
245881ec55
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-12 21:38:02 -03:00 |
|
James R
|
5fd6561d46
|
So you don't like macros?
|
2019-11-12 16:10:00 -08:00 |
|
Jaime Passos
|
3354169769
|
Merge remote-tracking branch 'origin/master' into f_wipes
|
2019-11-12 20:36:06 -03:00 |
|
MascaraSnake
|
c87297e3df
|
Merge branch 'a_skullattack-hang' into 'master'
GFZ3's boss hangs when dodging
See merge request STJr/SRB2Internal!403
|
2019-11-12 18:25:58 -05:00 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
toaster
|
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 |
|
toaster
|
cc499515da
|
Update ZB config for Glaregoyle and Buggle object names, and Glaregoyle sprite name.
|
2019-11-12 15:57:23 -05:00 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
6b567bfb5c
|
Merge branch 'dashmodecut' into 'master'
Dashmode polish
Closes #266
See merge request STJr/SRB2Internal!418
|
2019-11-12 15:40:46 -05:00 |
|
MascaraSnake
|
857dbd8488
|
Merge branch 'knuxstuff' into 'master'
Knuckles changes: the fixes
See merge request STJr/SRB2Internal!428
|
2019-11-12 15:40:15 -05:00 |
|
Jaime Passos
|
91a01be891
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-11 14:41:55 -03:00 |
|
Jaime Passos
|
4e6513b583
|
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
|
2019-11-11 14:05:03 -03:00 |
|
MascaraSnake
|
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 |
|