Alam Arias
7b182d37b9
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-01-20 17:03:17 -05:00
Sryder
b18a8dbc8d
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
8736952aad
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
49f2d65e95
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
83a6f5d6ae
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-23 18:09:17 -05:00
mazmazz
c0a0c5ac5d
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-23 18:09:14 -05:00
Digiku
402860dc06
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
f55623ef9c
Clear all control keys before loading defaults in LoadConfig
2018-12-23 14:59:26 -05:00
mazmazz
e3d106d527
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-22 23:42:25 -05:00
TehRealSalt
1291d35e08
Don't allow non-keyboard keys to screenshot/gif in menus
2018-12-22 00:39:32 -05:00
mazmazz
f1fea30045
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
mazmazz
71da6836c0
Reset default controls for LOADCONFIG command
2018-12-20 10:13:43 -05:00
mazmazz
969960a1eb
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
mazmazz
b64dd82034
Attempt to fix cv_execversion being accessible by console
2018-12-17 13:39:24 -05:00
mazmazz
657e7321f6
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
mazmazz
d18b2cda59
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
mazmazz
b1641aa8e9
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
mazmazz
3ceeb6a205
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
mazmazz
5b3a1e0c55
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
TehRealSalt
d53e4af93a
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-05 20:46:48 -05:00
mazmazz
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
mazmazz
2a87093ece
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
TehRealSalt
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
00fc67ba36
Reset to defaults option in controls
2018-11-22 22:50:40 -05:00
toaster
aa607ecf4c
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
95ed3fcf7e
Save current renderer to screenshots
2018-11-13 17:19:22 -05:00
TehRealSalt
c5e30aa018
Don't allow non-keyboard keys to screenshot/gif in menus
2018-10-04 22:06:56 -04:00
TehRealSalt
cf5c0a7a6a
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
8d056d3ca5
better parentheses
2018-07-07 16:46:32 -04:00
Alam Arias
a79b9a9127
Update m_misc.c
2018-07-07 20:41:11 +00:00
TehRealSalt
2e3afaa7f5
Fix incorrect PRIdS
...
Thanks, Alam!
2018-07-07 16:38:14 -04:00
Alam Arias
7da6aca450
Update m_misc.c
2018-07-07 20:33:19 +00:00
TehRealSalt
e39de53fa2
Use strlen for all of the valid zone title/act num checks
2018-06-05 17:28:46 -04:00
TehRealSalt
0fc113e6dd
actnum is now a 2 character long string
...
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt
36b52e1c67
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
581e231a3e
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
8090ea4ed0
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
toasterbabe
5f4f6fdac8
Public remake of a merge request I shouldn't have put in Internal in the first place.
2016-09-26 18:35:13 +01:00
Monster Iestyn
69f556d40a
Split AA trees code from m_misc.c/.h into m_aatree.c/.h
...
Also updated any relevant project files that I can think of to include the new files, as well as the makefile of course. Some of the other project files haven't been touched in years so I'll leave those alone ...unless someone objects
2016-06-05 21:29:40 +01:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Inuyasha
7c79bbc0b3
Proper overflow checking, applied to FOFs and midtex's too
...
This fixes the annoying flickering when you pass by water, FOFs, tall grass, etc.
2016-05-02 05:29:30 -07:00