Commit graph

129 commits

Author SHA1 Message Date
Tatsuru
df249a4a4d Merge branch 'folder-fixes' into 'next'
Fix minor issues with folder addons

See merge request STJr/SRB2!1617
2021-09-12 21:08:07 +00:00
LZA
aaf4653f1e Fix minor issues with folder addons 2021-09-12 21:08:06 +00:00
Tatsuru
6ed063dcce Merge branch 'polish-lua-inputs' into 'next'
Polish the Lua input library

See merge request STJr/SRB2!1598
2021-09-11 14:59:41 +00:00
LJ Sonic
5340db5f67 Make gc_ constants uppercase 2021-08-15 16:15:28 +02:00
LJ Sonic
5bc0ce7a62 Give fields in event_t better names 2021-08-14 23:42:39 +02:00
LJ Sonic
4af3b860fd Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into folder-next 2021-06-25 00:30:30 +02:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -04:00
Monster Iestyn
d00726cbe9 Merge branch 'monster-cleaning-up-again' into 'next'
Monster cleaning up again

See merge request STJr/SRB2!1433
2021-05-07 17:33:00 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Jaime Ita Passos
dca158096d Experimental implementation 2021-03-22 23:56:55 -03:00
Monster Iestyn
ee8acccd3c RETURN OF THE PORTS CHOPPING BLOCK: Destroy DOS!
Remove all remaining traces of the following macros for the obsolete DOS port, which were missed previously:
* `DJGPP`
* `__DJGPP__`
* `DJGPPDOS`
* `PC_DOS`
* `WATTCP`

May get rid of `MSDOS` later once I get word on whether I should kill it or not
2021-03-22 14:43:26 +00:00
Jaime Ita Passos
1254f691ee Fix unused variable warning when USE_APNG is not defined 2020-12-19 17:40:18 -03:00
GoldenTails
949c0c181d Add aPNG downscaling, and its associated consvar. 2020-11-19 13:45:04 -06:00
James R
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Steel Titanium
0d48d4c833 WIP: Remove support for DOS
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
GoldenTails
59bd6d45a3 Whose idea was it to make the aPNG speed 1/2x by default?! 2020-07-08 18:14:11 -05:00
Louis-Antoine
34c5da39e2 Create FIL_ConvertTextFileToBinary 2020-05-19 20:00:58 +02:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
e3ba369ae4 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
3ea51c943a 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
5b08e1802d Trim the trailing zeros off floats for cvars 2020-01-20 23:14:26 -08:00
Alam Ed Arias
b97b9ac7a8 Merge branch 'master' into next 2020-01-16 20:18:54 -05:00
James R
f8666d6cee Merge branch 'word' into 'master'
Word jumping

See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
Alam Ed Arias
709489cab8 Merge branch 'master' into next 2020-01-16 12:08:36 -05:00
Monster Iestyn
9c8988ab57 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
702b23ec3f Put the word jumping code in functions 2020-01-08 12:58:19 -08:00
fickleheart
f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart
b22de48c03 Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
e0f35d207f Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
Nev3r
aaef412823 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
d588e3ca9c Merge branch 'master' into next 2019-12-28 21:43:16 -05:00
Jaime Passos
244f0b228f Fix M_PathParts instead 2019-12-28 22:18:41 -03:00
Alam Ed Arias
94bb6655a5 Merge branch 'master' into next 2019-12-27 17:08:16 -05:00
James R
e19d0877e8 Merge branch 'time' into 'master'
haha log files

See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
Nev3r
9b89ed92f5 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
36996c8c91 Treat strings inside ""s as a single token. 2019-12-24 10:27:23 +01:00
Nev3r
ce3f526a5e Ignore '=' and ';' when tokenizing, for textmap reading's sake. 2019-12-24 10:25:38 +01:00
James R
5fbe77cdda Let an asbolute path work with -logfile 2019-12-23 17:40:43 -08:00
James R
457e986b75 -logdir lets the user change the log directory 2019-12-23 17:21:58 -08:00
Jaime Passos
c578cee0b1 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs 2019-12-12 01:39:46 -03:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
6398779983 Correct two instances where "Zone" is forced uppercase. 2019-11-25 16:04:03 +00:00
Steel Titanium
efac76f833
Merge branch 'public_next' into 'master' 2019-11-18 15:39:41 -05:00
James R
82ad6685a6 Remove defaultname, since players are probably sure on their name change 2019-11-15 17:32:43 -08:00
James R
6595d20709 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
d467d2b229 GIF recording 2019-11-10 00:21:48 -03:00
Monster Iestyn
520deac658 remove last few specks of Windows CE code I missed years ago 2019-10-22 16:39:44 +01:00
Steel Titanium
cc80cd77c5
Fix this mistake 2019-09-08 16:54:40 -04:00
Steel Titanium
8ee0a9309b
Better directory structure 2019-09-08 01:29:09 -04:00
Alam Ed Arias
92a954609d Merge branch 'public_next' into private 2019-08-08 23:41:19 -04:00