Commit graph

112 commits

Author SHA1 Message Date
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
f51772b29d Fix M_Ftrim
- Use '%f' instead of '%g' to avoid going scientific. Should also fix some
  compiler warnings.
- The trailing zero trimming code is now useful. It started on the terminating
  byte before and wouldn't have done anything with '%g' anyway.
- Use the absolute fractional value to avoid a sign.
2020-02-17 19:38:14 -08:00
James R
d1aa45212d Merge branch 'trim-floats' into 'master'
Trim the trailing zeros off floats for cvars

See merge request STJr/SRB2!716
2020-02-17 00:04:15 -05:00
James R
99ad30796c Trim the trailing zeros off floats for cvars 2020-01-20 23:14:26 -08:00
Alam Ed Arias
54c778b18c Merge branch 'master' into next 2020-01-16 20:18:54 -05:00
James R
1de00bc6bb Merge branch 'word' into 'master'
Word jumping

See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
Alam Ed Arias
282abfd4ac Merge branch 'master' into next 2020-01-16 12:08:36 -05:00
Monster Iestyn
9c1b15c986 Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff! 2020-01-11 18:48:47 +00:00
James R
0f4ef9a354 Put the word jumping code in functions 2020-01-08 12:58:19 -08:00
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
Nev3r
6e8a023fdd Add basic textmap support; currently crashes when trying to free the virtres, at vres_free(). 2019-12-30 11:33:22 +01:00
Alam Ed Arias
1785b8149e Merge branch 'master' into next 2019-12-28 21:43:16 -05:00
Jaime Passos
ce138d67dc Fix M_PathParts instead 2019-12-28 22:18:41 -03:00
Alam Ed Arias
2c03fcaac5 Merge branch 'master' into next 2019-12-27 17:08:16 -05: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
Nev3r
5a1c375c29 Merge branch 'tokentweaks' into 'next'
Slight touchups on the tokenizer

See merge request STJr/SRB2!569
2019-12-25 06:22:11 -05:00
Nev3r
23d7b726d4 Treat strings inside ""s as a single token. 2019-12-24 10:27:23 +01:00
Nev3r
463f2619ec Ignore '=' and ';' when tokenizing, for textmap reading's sake. 2019-12-24 10:25:38 +01: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