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 |
|
TehRealSalt
|
fcc1554467
|
Play bubble breathe sound for bots
|
2017-09-24 13:43:36 -04:00 |
|
Nevur
|
77d7b1495c
|
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement
|
2017-09-24 14:52:41 +02:00 |
|
TehRealSalt
|
09c3c58575
|
Obligatory "fixing a very tiny and very stupid mistake" commit :p
|
2017-09-21 17:38:42 -04:00 |
|
TehRealSalt
|
6b448f72ee
|
A_GhostMe lets you change fuse with var1, fixed the walking-spin frames bug For Real This Time
|
2017-09-21 17:34:53 -04:00 |
|
TehRealSalt
|
d55f84bec0
|
Camera scaling to splitscreen mode
Stacks with analog's camera buff. The camera height of both are also now
proportional with their dist
|
2017-09-21 16:43:55 -04:00 |
|
Alam Ed Arias
|
62264901e5
|
Merge branch 'master' into next
|
2017-09-20 17:18:58 -04:00 |
|
TehRealSalt
|
cfce6650ca
|
Fix holding spin while landing putting you in your walking state, remove commented out stuff
|
2017-09-20 16:53:05 -04:00 |
|
TehRealSalt
|
7c7bf243a2
|
Okay, nope, still nothing; reverting
|
2017-09-20 16:20:30 -04:00 |
|
TehRealSalt
|
4e7b817945
|
Does THIS fix the conflicts??
|
2017-09-20 16:14:00 -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 |
|
TehRealSalt
|
6a0f50cdf5
|
Resolve conflicts
|
2017-09-19 17:27:13 -04: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 |
|
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 |
|
TehRealSalt
|
da82a6bb56
|
Replaced instances of "joystick" with "gamepad" in menus
|
2017-09-19 00:33:53 -04:00 |
|
TehRealSalt
|
d1e379f4f9
|
Whoops, forgot P2
|
2017-09-19 00:30:08 -04:00 |
|
TehRealSalt
|
e020352c0c
|
Fixed diagonal analog input being weakened
Using a keyboard and an analog stick should now give you similar
acceleration in all directions.
|
2017-09-19 00:26:05 -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 |
|
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 |
|
TehRealSalt
|
5cc8734da7
|
Prevent bots from killing bubbles
Self-explanatory. They can still breathe them in, they just no longer
get popped
|
2017-09-17 21:37:36 -04:00 |
|
