Commit graph

100 commits

Author SHA1 Message Date
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Alam Ed Arias
848a144956 fread and fwrite use size_t, not int 2019-12-27 13:08:26 -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
James R
699407dbb0 I'm an idiot 2019-12-24 11:14:21 -08:00
James R
984281e85e Merge remote-tracking branch 'origin/master' into time 2019-12-24 11:02:31 -08:00
James R
908266f583 symlink latest-log.txt on nix, copy to the real log file everywhere else 2019-12-23 18:20:04 -08:00
James R
cbf3c24297 Handle log file in parent properly 2019-12-13 16:51:49 -08:00
James R
ff73055b56 Add this back for Windoodoo because I'm an idiot 2019-12-13 15:04:31 -08:00
James R
a9679eb440 Rename signal caught message to be more obvious 2019-12-12 22:01:16 -08:00
James R
e13853e9ba Fix signal handler setup error reporting 2019-12-12 21:57:54 -08:00
James R
6f2324d8df Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place 2019-12-12 21:30:35 -08:00
James R
648f5221c7 Kill child when wait fails, so I_Error exits both 2019-12-12 21:21:25 -08:00
James R
11910e844c Fix idiot mistake 2019-12-12 21:20:51 -08:00
James R
5d9cd1c72a Move everything to i_system.c
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-12 15:08:27 -08:00
James R
ff41ba7979 nix: Fork before game code and wait to catch signals and coredumps
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.

"(core dumped)" is also included in the message if core dumping could be
determined.
2019-12-11 23:46:57 -08:00
James R
b701baca6d Move I_ShutdownConsole to I_ShutdownSystem 2019-12-11 22:10:22 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
91d2beebfa * Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
Steel Titanium
cecbf95002 Various of changes
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
2019-09-23 22:46:44 -04:00
Steel Titanium
a18872652f Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
Alam Ed Arias
8a69d97a12 Be clear on what FALLTHRU we really want 2019-09-09 15:02:13 -04:00
Steel Titanium
e1b14d3d7d Fix function being redefined 2019-09-08 19:39:23 -04:00
Steel Titanium
0b5bc8f64f Merge branch 'master' into internal-hotplug-stableid
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
2019-09-08 01:55:36 -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
257f31c1ba Merge branch 'public_next'
# Conflicts:
#	src/doomstat.h
#	src/g_game.c
2019-03-28 14:19:02 +00:00
Steel Titanium
3c1f0b5e3f New -noxinput and -nohidapi command line parameters. 2019-03-03 22:57:09 -05: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
wolfy852
cc7112eaf5 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06: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
mazmazz
f90348ac05 Better I_InitJoystick log message 2018-12-14 06:14:21 -05:00
mazmazz
f7727fac5a Don't override an already-active controller
* Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 05:02:41 -05:00
mazmazz
732956088a Lots of changes to better support hotplugging and unstable device indexes
* Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run
* Properly set cv_usejoystick/2 for menu toggling
* Force-disable a player's joystick if setting another player's joystick to the same device
* Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 03:58:07 -05:00
mazmazz
18287c09bb Properly handle unstable device indexes for hotplug 2018-12-14 01:45:18 -05:00
mazmazz
601535fe41 Attempt to handle unstable device IDs 2018-12-14 00:22:25 -05:00
mazmazz
d2e39c660e Improve hotplug edge case with changing device indexes; return proper joy_open output on error 2018-12-13 23:52:04 -05:00
mazmazz
651c99c5e3 Change joystick log messages to DBG_GAMELOGIC 2018-12-13 23:26:07 -05:00
mazmazz
1cdbe75183 Handle unstable device index when hotplugging controller 2018-12-13 23:09:05 -05:00
mazmazz
cc6daa751d Disable XINPUT before initing the joy subsystem 2018-12-06 14:03:46 -05:00
mazmazz
c4f035dfa9 Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
(with log messages)
2018-12-06 10:54:58 -05:00
Digiku
2c557d668a Merge branch 'joystick-juggling' into 'master'
Joystick juggling

See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
mazmazz
a7b12b3ce5 Use static joyname instead of malloc 2018-12-03 12:35:12 -05:00
mazmazz
856f826afb Copy string from SDL_JoystickNameForIndex before the subsystem is shut down 2018-12-03 05:37:07 -05:00
Monster Iestyn
dadaf83e41 Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
(This is what I should have done in the first place)
2018-12-02 17:42:51 +00:00
Monster Iestyn
0bff44e22b Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't 2018-11-23 19:12:48 +00:00
Steel Titanium
0c30cd0fa1 Merge branch 'master' into responsefile-fix 2018-11-22 23:02:20 -05:00
Monster Iestyn
4c3bfe81bd Merge branch 'public_next'
# Conflicts:
#	src/Makefile
#	src/doomtype.h
#	src/hardware/hw_clip.c
#	src/hardware/hw_main.c
#	src/sdl12/sdl_sound.c
2018-11-10 19:18:34 +00:00
Monster Iestyn
51ee510b85 Merge branch 'gcc-compiling-cleanup' into 'master'
Compiling cleanup and fixes

See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
Monster Iestyn
7989e9a482 Merge branch 'public_next'
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/g_game.h
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_hudlib.c
#	src/lua_libs.h
#	src/lua_maplib.c
#	src/lua_script.c
#	src/m_misc.h
#	src/p_mobj.c
#	src/s_sound.c
#	src/sdl12/mixer_sound.c
#	src/w_wad.c
2018-11-10 15:41:57 +00:00
Monster Iestyn
b34e8c5390 Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00:00