5729ba3cd2
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
915e50a1e4
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
2d1a574e09
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
70df5242a3
Extend map name text matching code into a function
2019-10-27 14:23:03 -07:00
5ac8a26814
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-10-22 21:15:20 -07:00
7746767735
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
3285cc9a0d
Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?)
2019-09-18 16:06:13 +01:00
1e506ef180
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 23:35:36 -03:00
89c4989987
Show a negative number to indicate ammo penalty
2019-08-26 16:07:17 -07:00
84c9633579
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-08-04 21:33:13 -04:00
8a0f1e7ed4
Merge branch 'ending' into 'master'
...
ENDINGS
See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
d541bb7ead
* Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated.
2019-07-30 17:24:21 +01:00
47554b57e4
* Made the evaluation screen even more attractive.
...
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
2019-07-29 14:55:36 +01:00
dc0a92ea62
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
521d8fd8c1
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
2fb569857a
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
...
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names
# Conflicts:
# src/doomstat.h
# src/m_menu.c
2019-03-18 22:00:23 +00:00
075f28b7c8
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
89c12a4ee8
Reset timedemo counters after wipe
2018-12-27 23:23:09 -05:00
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
c69cfefb6d
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
cd57be640c
Merge branch '21-controls' into 'next'
...
Default control changes for 2.1.21
See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
2acad7ad86
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 11:10:18 -05:00
74da082c75
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
a0926b5314
First time tutorial prompt fixes
2018-11-12 19:10:41 -05:00
28238c41df
WIP: First-time tutorial prompt
2018-11-10 02:30:21 -05:00
4dd5abf534
Merge branch 'master' into next
2018-10-31 23:10:57 +00:00
31f3f8b8e7
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2018-10-11 21:24:53 +01:00
0ad0f8afc4
Move analog consvars to g_game.h
2018-10-11 19:39:11 +01:00
4b7af892e1
Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts
2018-10-11 19:37:24 +01:00
8747a8529d
Changed chat position,
...
Added chat back tint
Fixed word wrapping glitches
2018-08-19 10:58:29 +02:00
ac7c249fd2
SRB2chat test rework
2018-07-31 11:10:02 +02:00
62927bbb76
* Hold the pause button to restart a record attack run!
...
* Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif
* Show powerup display in singleplayer even while holding Game Status button.
2018-06-14 00:58:28 +01:00
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
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
bfca420f47
Merge branch 'master' into gametype-strings
2017-10-30 21:34:16 +00:00
0fe1f9d63b
* "BAD DEMO!!" and "ANALOG" attachments to the input viewer
...
* Minor refactor
2017-10-18 13:22:57 +01:00
7c7bf243a2
Okay, nope, still nothing; reverting
2017-09-20 16:20:30 -04:00
4e7b817945
Does THIS fix the conflicts??
2017-09-20 16:14:00 -04:00
6a0f50cdf5
Resolve conflicts
2017-09-19 17:27:13 -04:00
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
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
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
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
42211f02b4
* Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues.
...
* Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag.
* Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
2017-08-20 13:14:17 +01:00
fd63db0aaf
Starting lives revamp, per the 2.2 priorities topic list!
...
* Each time you die, the number of game overs you've had is counted.
* Your save file updates to record this.
* The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game).
Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
2017-08-18 00:58:16 +01:00
a4cd7b7f38
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
...
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names
2017-06-25 17:28:07 +01:00
e3f627120f
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/p_mobj.c
2017-06-23 17:19:06 +01:00
ba6d011d7b
Scale should be fixed_t not UINT16!
...
This is probably a leftover from how scaling worked in v2.0 I take it
2017-06-17 17:22:45 +01:00
bc79365cf4
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2017-05-18 16:54:58 +01:00
0921244ba4
Move analog consvars to g_game.h
2017-04-14 19:00:46 +01:00
887e7e0b7d
Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts
2017-04-14 17:45:27 +01:00
05ebc93f6c
After discussion with Mystic and Rob, you now keep your lives, score and emerald count when changing maps in Co-op mode. Reset when you declare -force.
2017-02-01 21:31:35 +00:00
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
02a3b0776c
SRB2 2.1.7 release
2014-04-14 01:14:58 -04:00
15bd266cac
SRB2 2.1.5 release
2014-03-23 12:00:29 -04:00
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
toaster
