Monster Iestyn
c90ddbca36
Merge branch 'makefile-ports-tweaks-cleanup-etc' into 'master'
...
Makefile ports tweaks cleanup etc
See merge request !211
2017-09-28 17:31:33 -04:00
Alam Ed Arias
2629301947
Merge branch 'public_next' into master
2017-09-28 17:29:02 -04:00
toasterbabe
d38b627b85
woops
2017-09-28 22:20:16 +01:00
Alam Ed Arias
6c18d15b4a
Merge branch 'master' into next
2017-09-28 16:55:04 -04:00
Alam Ed Arias
01602fa1f1
Build: fixup warnings in Debug builds
2017-09-28 16:54:26 -04:00
Alam Ed Arias
16b3f65660
Merge branch 'master' into next
2017-09-28 16:28:22 -04:00
Alam Ed Arias
92aa0e000e
Travis: can not use set version with sdl2
2017-09-28 16:24:22 -04:00
Alam Ed Arias
1ab0697fee
Merge branch 'master' into next
2017-09-28 16:09:07 -04:00
Alam Ed Arias
a356beac2c
Travis: install SDL2 2.0.6 and SDL2_Mixer 2.0.1
2017-09-28 15:31:34 -04:00
toasterbabe
9446fe6cd6
Tweak some HUD stuff, including a more consistent application of MAXSCORE.
2017-09-28 20:24:40 +01:00
Alam Ed Arias
0eafaafca1
Travis: drop sdl2_mixer from MacPorts and use SDL 2.0.6
2017-09-28 13:49:57 -04:00
Alam Ed Arias
1be137f461
cleanup
2017-09-28 11:10:24 -04:00
Alam Ed Arias
3a2a6076b3
Merge branch 'public_next' into master
2017-09-28 11:09:48 -04:00
Alam Ed Arias
30a42c0d72
Merge branch 'master' into next
2017-09-28 11:07:35 -04:00
Alam Ed Arias
9adf5f811b
CircleCI: remove blank lines
2017-09-28 11:06:57 -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
ec125628ab
Merge branch 'master' into next
2017-09-28 10:16:35 -04:00
Alam Ed Arias
1ffdd2e945
Travis: still need to keep -Wno-tautological-compare for GCC 7
2017-09-28 10:15:10 -04:00
Alam Ed Arias
7f98c5c804
Build: do not error on fallthrough
2017-09-28 10:02:08 -04:00
Alam Ed Arias
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
Alam Ed Arias
55f377ba3d
Build: kill GCC 7's format-overflow warnings
2017-09-28 09:13:46 -04:00
Alam Ed Arias
bdba212b2a
Makefile: add support for GCC 7.1 and 7.2
2017-09-28 09:13:01 -04:00
Alam Ed Arias
7e23014d5f
Makefile: support GCC 6.4
2017-09-28 09:04:36 -04:00
toasterbabe
f0ce22edb6
Fix issue #72 (where closed captioning jingles didn't account for pausing).
2017-09-27 15:37:52 +01: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
Alam Ed Arias
62264901e5
Merge branch 'master' into next
2017-09-20 17:18:58 -04:00
Monster Iestyn
829328637d
Merge branch 'netcode-fixes-the-sequel' into 'next'
...
Netcode fixes the sequel
See merge request !207
2017-09-20 15:00:09 -04:00
Monster Iestyn
533fdcae0a
Merge branch 'custom-savegames-home-path-fix' into 'master'
...
Fix save games for a custom mod not saving to custom home folder
See merge request !209
2017-09-20 14:56:39 -04:00
toasterbabe
ca42659e03
Made a mistake in the directionchar branch. I'm pushing to master - naughty naughty - but nobody's around to stop me and it's my birthday c:
2017-09-19 14:22:17 +01:00
toasterbabe
48c0ef2362
Remove extraneous DEH_WriteUndoline's.
2017-09-19 13:21:48 +01: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
toaster
ecfeb7b0af
Merge branch 'spr2fixes' into 'master'
...
Sprite2 MD2s and customisable defaulting
See merge request !115
2017-09-19 07:49:04 -04:00
toaster
6d03c50966
Merge branch 'continue_startinglives' into 'master'
...
Save cards and continue startinglives-balancing
See merge request !114
2017-09-19 07:45:35 -04:00
toaster
b805380294
Merge branch 'titlemap' into 'master'
...
Titlemap
See merge request !97
2017-09-19 07:44:00 -04:00
toaster
c389328789
Merge branch 'mi-misc-whatever' into 'master'
...
MI misc whatever
See merge request !111
2017-09-19 07:40:29 -04:00
toasterbabe
5bd71970ad
Make chat visible in the evaluation gamestate.
2017-09-18 21:38:51 +01:00
Monster Iestyn
7f875131ee
If compiling for GP2X with SDL, make it use SDL 1.2 interface like the others
...
Doing this way because I have no idea if the GP2X port was SUPPOSED to use SDL or not in the first place
2017-09-18 18:14:05 +01: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
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
Monster Iestyn
2c73c1657f
Restored all missing objs/bin subfolders from the move to Git, held in place by .gitignores
2017-09-17 17:20:51 +01:00
toasterbabe
8fd5bb6342
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into directionchar
2017-09-17 17:16:02 +01:00
toasterbabe
148f2cc607
* Updated the circumstances under which autobrake is applied.
...
* Made drawangle updated when jumping off a wall as Knuckles.
2017-09-17 17:09:26 +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
d44a36c8fe
* Make autobrake scaled to low-friction surfaces.
...
* Make rope hangs change how they handle the player's angle a little more organically.
2017-09-17 12:10:33 +01:00
toasterbabe
725e015a19
Fix the bracketing on the autobrake calculation.
2017-09-16 22:49:18 +01:00
Monster Iestyn
b040113246
Removed the wrong endif by mistake
2017-09-16 20:59:35 +01:00
Monster Iestyn
a33bb70a0c
Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12
...
Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too
2017-09-16 20:26:04 +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
