James R
4f40edaf01
Maybe localdisplayplayers is a bad idea
2020-02-23 23:21:20 -08:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
james
ad8e7d8c3c
Support aPNG in new versions of libpng
...
A known issue: iTXt cannot be written (yet). I may do something about that.
For now, this is likely good enough. Who cares about the extra text anyway?
2019-02-10 23:52:02 -08:00
Alam Arias
d7a14d7fa9
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-01-20 17:03:17 -05:00
Sryder
517a32e96d
Disable the APNG code if the version of libpng is greater than 1.4.
...
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
SeventhSentinel
3fe7856ba3
Keep execversion stuff on, just dummied out
...
Had issues with skin values not changing from the menu, this seemed to fix it
2019-01-06 01:41:42 -05:00
SeventhSentinel
046d66d803
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
915c90d9f3
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-23 18:09:17 -05:00
mazmazz
9c8487e8eb
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-23 18:09:14 -05:00
Digiku
8d05795f65
Merge branch 'loadconfig-defaultcontrols' into 'master'
...
Reset default controls for LOADCONFIG command
See merge request STJr/SRB2!403
2018-12-23 17:14:34 -05:00
mazmazz
ff2ec801bc
Clear all control keys before loading defaults in LoadConfig
2018-12-23 14:59:26 -05:00
mazmazz
4fad53fe94
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-22 23:42:25 -05:00
TehRealSalt
e5c308c1d7
Don't allow non-keyboard keys to screenshot/gif in menus
2018-12-22 00:39:32 -05:00
mazmazz
4e055bd383
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
mazmazz
e7cc04a46e
Reset default controls for LOADCONFIG command
2018-12-20 10:13:43 -05:00
mazmazz
1e731416d0
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
mazmazz
1d4fd996cf
Attempt to fix cv_execversion being accessible by console
2018-12-17 13:39:24 -05:00
mazmazz
80d027ee47
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
mazmazz
a396ad5240
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
mazmazz
2406de3167
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
mazmazz
439fff4402
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
mazmazz
e8584f2535
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
TehRealSalt
91448ddd95
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-05 20:46:48 -05:00
mazmazz
22232847e2
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
mazmazz
ec361ee6ac
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
ea655ba27a
Reset to defaults option in controls
2018-11-22 22:50:40 -05:00
toaster
5fe9cbba3d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00:00
Steel Titanium
792d42ebd9
Save current renderer to screenshots
2018-11-13 17:19:22 -05:00
TehRealSalt
f1c7eb4907
Don't allow non-keyboard keys to screenshot/gif in menus
2018-10-04 22:06:56 -04:00
TehRealSalt
771367c5d7
New bindable keys
...
You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads
They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
2018-09-27 16:55:21 -04:00
TehRealSalt
b7e8f89df7
better parentheses
2018-07-07 16:46:32 -04:00
Alam Arias
57f74bcc82
Update m_misc.c
2018-07-07 20:41:11 +00:00
TehRealSalt
7d49129f25
Fix incorrect PRIdS
...
Thanks, Alam!
2018-07-07 16:38:14 -04:00
Alam Arias
b4d84a171e
Update m_misc.c
2018-07-07 20:33:19 +00:00
TehRealSalt
4fd88293ff
Use strlen for all of the valid zone title/act num checks
2018-06-05 17:28:46 -04:00
TehRealSalt
a1fad489c6
actnum is now a 2 character long string
...
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt
8fe068ef46
Merge remote-tracking branch 'refs/remotes/srb2public/next'
...
# Conflicts:
# src/f_finale.c
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/m_misc.c
2018-04-07 18:43:59 -04:00
TehRealSalt
9c5a09d770
sonicitems porting, Part 2
...
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
toasterbabe
e03e97edc8
Stop leaking names.
2018-01-30 21:25:28 +00:00
TehRealSalt
80f62a057d
SUCCESS
2017-12-17 22:27:26 -05:00
TehRealSalt
5fe2f4928f
Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
...
# Conflicts:
# src/doomdef.h
# src/sdl/i_main.c
# src/sdl/i_video.c
# src/y_inter.c
2017-10-17 15:53:34 -04:00
TehRealSalt
727d55b64e
Merge remote-tracking branch 'refs/remotes/srb2public/public_flatsprite' into zarrotsu
...
# Conflicts:
# src/doomdef.h
2017-10-17 00:40:38 -04:00
Alam Ed Arias
7f98c5c804
Build: do not error on fallthrough
2017-09-28 10:02:08 -04:00
ZTsukei
a1f2f5b675
New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all.
2017-09-01 13:01:59 -04:00
Monster Iestyn
48777e60ed
check i not add, silly
2017-03-29 21:27:44 +01:00
ZTsukei
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
