a626660564
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-25 00:19:42 -05:00
82a40f0dba
Support Look Up/Down keys for NiGHTS movement
2018-12-24 23:48:03 -05:00
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
619dd9d08a
Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.
2018-12-22 12:34:17 +01:00
9525de2d83
Merge branch 'camera-backport' into 'next'
...
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
2018-12-20 16:57:23 -05:00
03a4bd8f53
Revert default changes
...
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
e763eab6cd
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05: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
17e9188c89
Merge branch 'execversion' into '21-version'
...
Block previous versions' config defaults with EXECVERSION consvar
See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
70aa4ce18e
Add alwaysfreelook2 and mousemove2 to config versioning
...
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
a802069313
Move joyaxis_fire default to right trigger
2018-12-06 05:55:56 -05:00
aaf5d2e1dc
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
42cb597731
Merge branch 'joystick-juggling-two' into 'next'
...
Joystick additions for menu, axis defaults, and vertical look toggle
See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
205e52f6d4
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
7e523a1e35
Reset vertical look when toggling joyaiming
2018-12-03 13:10:24 -05:00
59cabea8bd
Add joyaiming qualifier for joystick look up/down
2018-12-03 13:10:19 -05:00
6dd44ca1de
Change PC axis defaults to 360-friendly values
2018-12-03 13:10:15 -05:00
31f23fda8d
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
6d7689c1a7
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
54cae84849
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03: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
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
d4cb81cb28
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
b52158eb48
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01:00
3d0daf2202
Fix desynch when toggling analog mode or flipcam
...
Special thanks to Lat' for asking weird questions
2018-10-29 00:49:23 +01:00
29b242a5bd
Merge branch 'endgame-code-refactor-backport' into 'next'
...
Endgame code refactor
See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
feceaf6d30
Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission
...
Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
2018-10-11 21:25:15 +01:00
2bb7df5f49
G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt
2018-10-11 21:25:04 +01: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
9c464742b7
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2018-10-11 20:00:45 +01:00
91eb248e46
Fix up them there ghosts!
...
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
2018-08-25 17:11:49 +01:00
8747a8529d
Changed chat position,
...
Added chat back tint
Fixed word wrapping glitches
2018-08-19 10:58:29 +02:00
ad187c26f0
Repositionning chat & bugfixes
2018-07-31 15:57:19 +02:00
ac7c249fd2
SRB2chat test rework
2018-07-31 11:10:02 +02:00
3fb12cf337
Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode
2018-04-15 19:59:57 +01:00
ec125628ab
Merge branch 'master' into next
2017-09-28 10:16:35 -04:00
55f377ba3d
Build: kill GCC 7's format-overflow warnings
2017-09-28 09:13:46 -04:00
da2f5fe0a2
Fix PlayerSpawn hook not being called if the player is respawned at a starpost
2017-06-20 16:18:51 +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
f9b41898a9
Don't allow skipping stats in record attack/nights attack
2017-02-05 22:04:29 +00:00
3b503f1336
Use function va to avoid having to delcare a new variable. Thanks MonsterIestyn.
2016-09-11 14:59:24 -07:00
4abfe1e8f3
Fix MinGW/AppVeyor build.
2016-09-11 10:57:14 -07:00
2798bd5c16
Ensure demo files will save to srb2home, where SRB2 already looks for them.
2016-09-11 10:40:49 -07:00
44df9358dd
If the game becomes modified during a record attack run, end it
...
RA menu can be opened if the game is modified, but Start can't be selected. (Obvious reason: so scripts to display info can be used easier)
Fixed the stupid background for messages in the Record Attack menu, it was bugging me
2016-08-19 22:18:43 -07:00
mazmazz