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
|
90d385b402
|
fix crash
|
2019-11-12 22:03:40 -03:00 |
|
Jaime Passos
|
362be6f9da
|
Make cv_renderer a hidden command
Finally! Renderer switching IS SAVED!! 🎉 🎉 🎉 🎉 🎉 🎉
|
2019-11-12 21:44:43 -03: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 |
|
Jaime Passos
|
07110f8415
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-11-12 20:28:25 -03:00 |
|
Jaime Passos
|
e05d1ea5dc
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-11-12 20:27:49 -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 |
|
Jaime Passos
|
c6253bb6f9
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-11-12 20:25:40 -03:00 |
|
Jaime Passos
|
e96f2193c1
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-11-12 20:07:59 -03: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 |
|
Jaime Passos
|
05e5fa1637
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-11-12 18:26:51 -03: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
|
408288255f
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-11-11 14:10:37 -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 |
|
MascaraSnake
|
049e599f2e
|
Merge branch 'spinny-sign' into 'master'
Papersprite end signpost
See merge request STJr/SRB2Internal!442
|
2019-11-11 11:39:56 -05:00 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
aa5a3a46e8
|
Merge branch 'gamedata-param' into 'master'
Custom gamedata parameter
See merge request STJr/SRB2Internal!423
|
2019-11-11 11:36:53 -05:00 |
|
MascaraSnake
|
41b95437da
|
Merge branch 'rvz-cleanup' into 'master'
RVZ1 lag reduction
See merge request STJr/SRB2Internal!445
|
2019-11-11 11:29:53 -05:00 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
MascaraSnake
|
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 |
|
Digiku
|
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 |
|
Jaime Passos
|
6e0ff4a4a4
|
Recreate the CLUT when the palette changes
|
2019-11-11 00:08:38 -03:00 |
|
toaster
|
acc13c1a4a
|
* Add R_SkinUsable to Lua.
* Make R_SetPlayerSkin check for usability of skin before setting, and error otherwise.
|
2019-11-10 16:10:34 +00:00 |
|
toaster
|
e388b34abe
|
* Correctly grey out skin on MP charsel menu if skinchange is restricted.
* Also grey out colour if team gametype.
|
2019-11-10 15:21:14 +00:00 |
|
Jaime Passos
|
d467d2b229
|
GIF recording
|
2019-11-10 00:21:48 -03:00 |
|
Jaime Passos
|
615547ddd1
|
Fix animated flats yet again
|
2019-11-09 19:32:06 -03:00 |
|