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
Alam Ed Arias
5a79a446df
Tested to be compile with Mingw64 9.1.0
2019-08-08 21:25:46 -04:00
Monster Iestyn
149a8bb760
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
Jaime Passos
c591633733
Update m_misc.c
2019-06-14 14:13:41 -03:00
Monster Iestyn
e7e3b0ef38
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
6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots
2019-03-15 16:38:33 -03:00
Monster Iestyn
a93e96c75b
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
5620d0188e
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
7a0d8b408e
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
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
mazmazz
b3f7b169b2
Merge errors for compile
2019-01-07 17:05:20 -05:00
mazmazz
075f28b7c8
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
892e650712
dumb
2019-01-02 01:01:57 -03:00
Jimita the Cat
e765b9400c
Add support for flashpals in screenshots
2019-01-02 00:41:52 -03: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
