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
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
Monster Iestyn
dcb23e01c0
SDL_INIT_NOPARACHUTE does nothing in SDL 2.0, so don't use it anymore
2017-09-15 21:22:28 +01:00
Sryder13
f3a605de6b
I need to stop leaving things commented out that are going
2017-09-15 18:03:06 +01:00
Monster Iestyn
5fb551dd75
Removed 1.2.x version checks in these files, SDL 2.0.x should always have these files
2017-09-15 17:15:06 +01:00
Monster Iestyn
d2a76ca269
Removed references to console ports and WinCE in sdl/Makefile.cfg
2017-09-15 17:12:53 +01:00
Monster Iestyn
9e6ed121ba
Comment out sdl12/SRB2CE/cehelp.h include in m_fixed.h
...
I think it was originally included for defining the "USEASM" macro, but USEASM isn't used by m_fixed.h/c code anymore
2017-09-14 21:29:38 +01:00
Monster Iestyn
900bab9b13
Fix includes for SDL 1.2-only ports' files
2017-09-14 21:15:38 +01:00
Monster Iestyn
5076861e0f
Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders
2017-09-14 21:09:35 +01:00
Monster Iestyn
c330907dba
Added a SDL12=1 flag to all ports whose interface code still lives in the sdl12 folder (and is unsupported by SDL 2.0 officially anyway)
...
This basically causes the makefile to use the sdl12 folder instead of the main sdl folder
2017-09-14 21:03:20 +01:00
Steel Titanium
cf41a11770
Fix for window being offcenter
2017-09-11 16:36:30 -04:00
TehRealSalt
8b53295a74
Remove instances of player state changes being done every tic
...
Makes it easier to change player state with Lua. Wasn't sure how to
tackle changing this for S_PLAY_CLIMB or S_PLAY_CLING, so I left them;
it's a minor ability-specific case anyway
2017-09-09 19:02:11 -04:00
toasterbabe
3c785cbe94
* Add Skid SPR2/state in preperation for directionchar.
...
* Clean up spr2 md2 code.
* Experimented but then commented out some stuff for homing attack.
2017-09-09 22:12:23 +01:00
Monster Iestyn
8514251ad5
fix savegamename not prepending srb2home to itself for custom mods using their own gamedata files
2017-09-09 21:19:07 +01:00
Sryder13
db99537a6b
Various Transparent Texture Fixes
...
Draw Textures and Flats that have holes in them like a solid polygon so they use the depth buffer and don't need to be sorted
Disable all linear filtering on textures and flats that have holes in them, the linear filtering introduces translucency into the textures where the edges are. Leaving them with either a black border, or causing pixels behind the slightly translucent areas to not be drawn. Doesn't apply to sprites and the HUD as they are always already sorted properly.
Make the Alpha Testing more strict on non-translucent blend modes. This makes it so any transparency below 0.5 is discarded instead. Would make anything that is blended and has holes in it look slightly better, only the HUD and MD2s where the texture has holes are effected currently.
Set TF_TRANSPARENT on flat texture flags when there are holes in the texture.
Minor fix to make sure MD2s always set the right blend mode
2017-09-09 00:44:13 +01:00
