Jaime Passos
ce138d67dc
Fix M_PathParts instead
2019-12-28 22:18:41 -03:00
James R
8311380146
Merge branch 'time' into 'master'
...
haha log files
See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
James R
1da751bdd3
Let an asbolute path work with -logfile
2019-12-23 17:40:43 -08:00
James R
aaf2ef21b3
-logdir lets the user change the log directory
2019-12-23 17:21:58 -08:00
Jaime Passos
740f095219
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-12 01:39:46 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
toaster
2b2d2a8441
Correct two instances where "Zone" is forced uppercase.
2019-11-25 16:04:03 +00:00
Steel Titanium
dc9a09f837
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
James R
d2cd9e7239
Remove defaultname, since players are probably sure on their name change
2019-11-15 17:32:43 -08:00
James R
37dc402540
Move setting from defaults to M_FirstLoadConfig, so it triggers even when the title screen doesn't start
2019-11-15 17:31:53 -08:00
Jaime Passos
e32238f0b5
GIF recording
2019-11-10 00:21:48 -03:00
Monster Iestyn
81d4bf8cd9
remove last few specks of Windows CE code I missed years ago
2019-10-22 16:39:44 +01:00
Steel Titanium
b979594c17
Fix this mistake
2019-09-08 16:54:40 -04:00
Steel Titanium
414bff33bf
Better directory structure
2019-09-08 01:29:09 -04:00
Alam Ed Arias
01020ae65f
Merge branch 'public_next' into private
2019-08-08 23:41:19 -04:00
Alam Ed Arias
5c0912bab1
Tested to be compile with Mingw64 9.1.0
2019-08-08 21:25:46 -04:00
Monster Iestyn
e95696c94b
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
Jaime Passos
cf7b9ccff4
Update m_misc.c
2019-06-14 14:13:41 -03:00
Monster Iestyn
67392baae0
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
Jimita
bced3656f2
Merge branch 'next' into flashpals-on-screenshots
2019-03-15 16:38:33 -03:00
Monster Iestyn
70d1006800
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/Srb2SDL-vc10.vcxproj
# src/sdl12/Srb2SDL-vc9.vcproj
# src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-03-02 20:51:15 +00:00
wolfs
8a6f4b6405
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Monster Iestyn
974e3aa4f2
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
2019-02-27 22:36:01 +00: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
mazmazz
4f40d2abdb
Merge errors for compile
2019-01-07 17:05:20 -05:00
mazmazz
81352aece1
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
Jimita the Cat
6f72f69575
dumb
2019-01-02 01:01:57 -03:00
Jimita the Cat
2cc6a22d12
Add support for flashpals in screenshots
2019-01-02 00:41:52 -03: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
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
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
eb4eef6104
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
Steel Titanium
792d42ebd9
Save current renderer to screenshots
2018-11-13 17:19:22 -05:00
mazmazz
658ecce249
->defalutvalue -- .defaultvalue adjustment
2018-11-12 17:37:54 -05:00
mazmazz
eb5f05848c
Also set cv_analog for tutorialgcs
...
* M_TutorialSaveControlResponse CV_Set adjustment
2018-11-12 17:34:56 -05:00
