Jaime Passos
|
249d563dd6
|
make S_PLAY_NIGHTS_PULL use A_RollAngle
|
2019-11-13 12:57:22 -03:00 |
|
Jaime Passos
|
3e759a2b75
|
rename rollaxis to rotaxis
|
2019-11-13 12:47:30 -03:00 |
|
Jaime Passos
|
ae630a9a23
|
Rotation axis (will rename internally later)
|
2019-11-13 12:36:44 -03:00 |
|
toaster
|
0999bb7678
|
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
|
a921e9c7d8
|
* 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
|
d648a2ad87
|
Merge branch 'radiomode' into 'master'
Radio mode
See merge request STJr/SRB2Internal!443
|
2019-11-13 04:16:38 -05:00 |
|
James R
|
6ee9c029e4
|
Warn if the first argument is an option
|
2019-11-12 18:29:42 -08:00 |
|
James R
|
83d31c782b
|
Get map name from multiple arguments
(This means you don't need quoting.)
|
2019-11-12 17:42:54 -08:00 |
|
Jaime Passos
|
8f2a34f58c
|
fix crash
|
2019-11-12 22:03:40 -03:00 |
|
Jaime Passos
|
d3fb98dfe4
|
Make cv_renderer a hidden command
Finally! Renderer switching IS SAVED!! 🎉 🎉 🎉 🎉 🎉 🎉
|
2019-11-12 21:44:43 -03:00 |
|
Jaime Passos
|
24d20d2abb
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-12 21:38:02 -03:00 |
|
James R
|
f7e879da06
|
So you don't like macros?
|
2019-11-12 16:10:00 -08:00 |
|
Jaime Passos
|
4acdb54d87
|
Merge remote-tracking branch 'origin/master' into f_wipes
|
2019-11-12 20:36:06 -03:00 |
|
Jaime Passos
|
9d4f653334
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-11-12 20:28:25 -03:00 |
|
Jaime Passos
|
f470fb6261
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-11-12 20:27:49 -03:00 |
|
MascaraSnake
|
00b8fc42b0
|
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
|
845b82668b
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-11-12 20:25:40 -03:00 |
|
Jaime Passos
|
55a63bbb2a
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-11-12 20:07:59 -03:00 |
|
MascaraSnake
|
9b4d0de22b
|
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
|
1db991bbdb
|
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
|
f7c5774b7e
|
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
|
66b009722b
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-11-12 18:26:51 -03:00 |
|
toaster
|
0deb13c1ed
|
Update ZB config for Glaregoyle and Buggle object names, and Glaregoyle sprite name.
|
2019-11-12 15:57:23 -05:00 |
|
MascaraSnake
|
fae4fb16e9
|
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
|
ee58e7d234
|
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
|
8f89ad3b72
|
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
|
5346d0b9e7
|
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
|
07228e6038
|
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
|
f984c28dd0
|
Merge branch 'dashmodecut' into 'master'
Dashmode polish
Closes #266
See merge request STJr/SRB2Internal!418
|
2019-11-12 15:40:46 -05:00 |
|
MascaraSnake
|
1a023f1bf4
|
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
|
b078b8791a
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-11 14:41:55 -03:00 |
|
Jaime Passos
|
d4bf34b714
|
Merge remote-tracking branch 'origin/master' into flats-in-walls
|
2019-11-11 14:10:37 -03:00 |
|
Jaime Passos
|
33de0ad0d7
|
Merge remote-tracking branch 'origin/master' into texture-flats-optimization
|
2019-11-11 14:05:03 -03:00 |
|
MascaraSnake
|
aefe87f19a
|
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
|
79b6f4247d
|
Merge branch 'spinny-sign' into 'master'
Papersprite end signpost
See merge request STJr/SRB2Internal!442
|
2019-11-11 11:39:56 -05:00 |
|
MascaraSnake
|
2c592e9000
|
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
|
04e966868d
|
Merge branch 'gamedata-param' into 'master'
Custom gamedata parameter
See merge request STJr/SRB2Internal!423
|
2019-11-11 11:36:53 -05:00 |
|
MascaraSnake
|
09f6c5e4fd
|
Merge branch 'rvz-cleanup' into 'master'
RVZ1 lag reduction
See merge request STJr/SRB2Internal!445
|
2019-11-11 11:29:53 -05:00 |
|
MascaraSnake
|
c724799bc7
|
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
|
a60f3c5a42
|
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
|
9b17d375e1
|
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
|
c7e6aedd53
|
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
|
2f346a295b
|
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
|
1d2f8630e3
|
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
|
0d66099290
|
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
|
c8b47193d8
|
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
|
a914277727
|
Recreate the CLUT when the palette changes
|
2019-11-11 00:08:38 -03:00 |
|
toaster
|
56bc3aa702
|
* 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
|
a2749d79a2
|
* 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
|
e32238f0b5
|
GIF recording
|
2019-11-10 00:21:48 -03:00 |
|