toasterbabe
eba0978a00
RIP smiles
2018-01-24 02:07:30 +00:00
toasterbabe
373bb329a2
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
2018-01-20 22:18:16 +00:00
Alam Ed Arias
30549addf3
Undo signed mess
2018-01-04 14:26:16 -05:00
Alam Ed Arias
75abd428fc
MSVC2015: fixup
2018-01-02 13:22:10 -05:00
toasterbabe
336a26602d
Not strictly pretty, but fixes a bug I discovered whilst working on this.
2017-12-10 14:35:55 +00:00
toasterbabe
e63c1d15d8
* Show an emerald token box on the tally screen.
...
* Change the horizontal spacing of the emeralds on the special stage tally screen.
* (unrelated) Fix a reference to srb2.srb instead of the now-correct srb2.pk3.
2017-11-17 23:02:34 +00:00
toasterbabe
c89b1ec234
Always allow the first singleplayer level in the MP level platter.
2017-11-02 21:20:55 +00:00
toasterbabe
2a42291b30
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit
...
# Conflicts:
# src/d_netcmd.c
2017-11-02 20:39:07 +00:00
toaster
49a1266ccc
Merge branch 'sal-misc-stuff' into 'master'
...
Sal misc stuff (state overwriting, gamepad tweaks)
See merge request STJr/SRB2Internal!116
2017-11-02 16:35:12 -04:00
toaster
605e51f6f3
Merge branch 'more_about_menus' into 'master'
...
More about menus
Closes #72
See merge request STJr/SRB2Internal!122
2017-11-02 16:31:51 -04:00
toaster
927e74e406
Merge branch 'FileManagement' into 'master'
...
File management - PK3 support.
See merge request STJr/SRB2Internal!121
2017-11-02 16:27:54 -04:00
toasterbabe
2458c06f5b
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into sal-misc-stuff
...
# Conflicts:
# src/g_game.c
2017-10-30 21:42:38 +00:00
Monster Iestyn
bfca420f47
Merge branch 'master' into gametype-strings
2017-10-30 21:34:16 +00:00
toasterbabe
d4e08551bf
* Make P_LoadVertexes a wrapper for P_LoadRawVertexes.
...
* Remove extraenous R_ClearTextureNumCache from P_LoadSidedefs2.
* Remove regressions in comments/#includes.
2017-10-30 20:54:14 +00:00
toasterbabe
f512b64563
Fix some mistakes when updating the function signature.
2017-10-26 17:30:08 +01:00
toasterbabe
df1e5eb9b7
* Optimise the new static code further.
...
* Update all the other V_DrawCroppedPatch calls to match the new behaviour.
* Fix the OGL version of V_DrawCroppedPatch to match the new behaviour.
(To justify my changes: It's not exposed to Lua, and the function signature was a mess. This way it's easier to mentally map how it would work.)
2017-10-26 16:59:02 +01:00
toasterbabe
b2e89f6832
WOOPS CAN'T UPDATE THE PLAYSIM RANDOM SEED IN A MENU
2017-10-26 11:45:08 +01:00
toasterbabe
4a4ba228df
Per request, remove the "/ * ACTION" stuff
2017-10-25 23:34:20 +01:00
toasterbabe
9a10dfeaee
Replaced the laggy randomised-at-runtime static with sufficiently random low-impact pregenerated static. Requires new patch.dta. https://cdn.discordapp.com/attachments/293238104096112641/372770688890830859/srb20003.gif
2017-10-25 16:40:21 +01:00
toasterbabe
d1e007ef8d
Change the little green light symbol on the save to indicate modifiedgame.
2017-10-24 00:06:13 +01:00
toasterbabe
50d6208913
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement
2017-10-21 14:28:44 +01:00
toasterbabe
49aa6ee339
Tweak to modifications to new level select.
2017-10-18 22:18:43 +01:00
toasterbabe
8372bde91b
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus
2017-10-18 21:02:50 +01:00
toasterbabe
a4f10a4b96
Fixed replays of skins whose realnames differed from their normal names from not being readable (by fixing the writing).
2017-10-15 12:35:49 +01:00
TehRealSalt
f0b938eb98
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff
...
# Conflicts:
# src/p_saveg.c
2017-10-14 16:20:56 -04:00
Monster Iestyn
3e595b8f1b
Merge branch 'master' into ports-chopping-block
2017-10-14 20:47:04 +01:00
wolfy852
93584f6811
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement
2017-10-07 14:52:40 -05:00
wolfy852
69d0e84b00
Merge branch 'FileManagement' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement
2017-10-07 14:48:56 -05:00
wolfy852
efb30f93ab
Fixes from toaster, plus some other things
2017-10-07 14:48:49 -05:00
toasterbabe
40ef1335a1
* Smiles hardcode!
...
* Add a default behaviour to followmobj (just basic A_CapeChase).
* Allow for modifying which character starting a new SP game should start you on, relative to the first valid character. (SOC's "startchar" variable)
* Make MF2_SHADOW transferrable via linkdraw.
* Modify P_GetSkinSprite2's recursion limiter to have zero chance of ever infinitely looping.
2017-10-03 18:18:18 +01:00
TehRealSalt
f31cdf395a
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff
...
# Conflicts:
# src/p_user.c
2017-09-30 22:29:16 -04:00
toasterbabe
8ffec89207
* Fix music not being properly restored when toggling music on/off ingame.
...
* Fix non-centiseconds rings position.
2017-09-30 15:28:38 +01:00
Monster Iestyn
49542cdaa1
Remove XBOXSTATIC and FILESTAMP, since only the XBOX port needed them
2017-09-29 19:46:23 +01:00
Monster Iestyn
f4e535a64d
Burned Dreamcast port at the stake
2017-09-29 18:19:34 +01:00
Alam Ed Arias
f0eee4737f
Menu: no more pop/push options
2017-09-28 17:45:27 -04:00
Alam Ed Arias
3e26e2a443
Menu: Compile M_DrawAddons without any optimizes
2017-09-28 17:38:14 -04:00
Alam Ed Arias
1be137f461
cleanup
2017-09-28 11:10:24 -04:00
Alam Ed Arias
5986720789
Build: fixups
2017-09-28 11:01:52 -04:00
Alam Ed Arias
f1a347e55f
Merge branch 'public_next' into master
2017-09-28 11:01:20 -04:00
Alam Ed Arias
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
toasterbabe
7fb2e6633e
Fix a crash.
2017-09-27 14:43:18 +01:00
toasterbabe
295b100df4
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus
...
# Conflicts:
# src/m_menu.c
2017-09-27 14:43:09 +01:00
TehRealSalt
4a51d4bee0
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff
...
# Conflicts:
# src/g_game.h
2017-09-19 17:07:09 -04:00
toaster
3cc14e3985
Merge branch 'directionchar' into 'master'
...
Autobrake & decoupling player sprite angle from camera angle
See merge request !69
2017-09-19 07:56:22 -04:00
TehRealSalt
da82a6bb56
Replaced instances of "joystick" with "gamepad" in menus
2017-09-19 00:33:53 -04:00
toasterbabe
918edda672
* Make exitlevel only work if someone's at the exit or you've visited the next map before.
...
* Added a message to suggest changing cheats before release to a future self.
* Removed the gametype selection menu, and baked its contents into the level platter instead (with an additional dose of pretty - https://cdn.discordapp.com/attachments/293238104096112641/359338275338584064/unknown.png )
2017-09-18 15:04:38 +01:00
TehRealSalt
ce0a49ede5
Add jump & spin joystick axis
...
Lets you set jump/spin to Xbox controller triggers, like you can with
fire/nfire
2017-09-17 22:30:48 -04:00
toasterbabe
970268ec38
Redid that ridiculous lastcoop thing as an MV_MP thing, which also means it gets properly cleared when you load mods with new save data.
2017-09-17 22:05:13 +01:00
toasterbabe
b217e9eb92
* Made levels with TOL_COOP inaccessible from the multiplayer map select unless you'd visited them in singleplayer (mapvisited, saves to gamedata) or visited a Co-op level number equal to/after it (multiplayer, doesn't save to gamedata)
...
* Tweaked Pandora's box to add:
- A mid-game link to the Addons menu.
- A button to give everyone SF_SUPER (except Tails in non-devmode executables).
2017-09-17 16:49:39 +01:00
toasterbabe
f90d595332
* cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist.
...
* cv_useranalog is now hidden from the menu.
* Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum.
* Tailsbot is now slightly more capable of keeping up with Sonic.
* pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL.
* [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-16 20:25:14 +01:00
