stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-12 13:52:05 +00:00
Code Issues Projects Releases Packages Wiki Activity
3590 commits 172 branches 41 tags 242 MiB
Commit graph

3590 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Nevur
f61755dd67 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-09-04 22:32:38 +02:00
Nevur
4aed951bd8 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 
# Conflicts:
#	src/r_things.h
#	src/w_wad.h
 2017-09-04 22:32:11 +02:00
Monster Iestyn
d65e23f3ec Merge branch 'public_next' 2017-09-04 20:19:47 +01:00
Monster Iestyn
d565cc6a2c Merge branch 'master' into next 2017-09-04 20:16:06 +01:00
Nevur
b087c16eb1 Merge branch 'toastfixes' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 
# Conflicts:
#	src/p_setup.c
#	src/p_spec.c
 2017-09-04 21:13:29 +02:00
Monster Iestyn
017df6cd75 Merge branch 'SDL2_RelMouse' into 'master' 
SDL2: Relative mouse mode

See merge request !206
 2017-09-04 15:11:50 -04:00
Monster Iestyn
1aa4972021 Merge branch 'floorzatpos-slopefix' into 'next' 
P_FloorzAtPos slope fix

See merge request !208
 2017-09-04 15:00:49 -04:00
Monster Iestyn
50917d2ee2 P_FloorzAtPos: Check the normal floor's slope as well as FOF slopes, silly. 2017-08-30 19:21:23 +01:00
toasterbabe
d6701edcb6 Don't allow creating a new save when it wouldn't end up making a save file (ie, modified game without savemoddata). 2017-08-27 18:47:24 +01:00
toasterbabe
79dab78fd3 * Support FF_SPR2ENDSTATE in interpoleration. 
* Fix skidding interpoleration bug.
 2017-08-27 16:35:19 +01:00
toasterbabe
973f700dcf * Make the model->spr2frames dynamically allocated. (There's only two settings - on and off - but that's better than it perpetually being on...) 
* Fix up defaulting for DEAD to go to PAIN.
 2017-08-27 14:56:07 +01:00
toasterbabe
76300026f8 * Added support for sprite2s to MD2s! 
- Name each frame either SPR2_**** or SUPER**** (where **** is the 4-character name)
    - If the name is 3 characters, '.' is accepted as a substitute for the '_', but a space/absent isn't (for tool-related reasons).
    - Adds a big sprite2 index array to all models, even non-player ones. Sorry!
* Made MD2 frame interpoleration only work across the same spriteset (and sprite2set).
* Made MD2 frame interpoleration happen when there's less than a quarter of a second between frames, as opposed to the hardcoded specific animation disabling.
* Fixed sprite2-related typo in dehacked.c.
 2017-08-26 18:56:23 +01:00
toasterbabe
4da6169892 Add spr2defaults[] array to make sprite2 defaulting system much, much simpler to manage. 
This is in preparation for a seperate project which still involves sprite2s.
 2017-08-25 18:00:20 +01:00
toasterbabe
3e2be5e47a Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into continue_startinglives 2017-08-25 13:50:50 +01:00
toasterbabe
9641196374 * Fixed bug with wide blank select pic being used instead of the normal one. 
* Added length cap to savegame's zone name.
* Refactor to level select's zone name length cap code.
 2017-08-25 00:40:45 +01:00
toasterbabe
16395f4dd2 Final corrections. Branch should be ready to merge now. 2017-08-24 21:29:29 +01:00
toasterbabe
00c62e6d88 * Removed unused info from struct as part of clean up. 
* Made botskin being invalid make the entire save invalid.
 2017-08-23 22:05:11 +01:00
Monster Iestyn
9c4e2eeeef Merge branch 'next' into netcode-fixes-the-sequel 2017-08-23 19:17:25 +01:00