James R
5e5f3c4fa7
Merge branch 'renderswitch' into 'master'
...
Renderer switching
See merge request STJr/SRB2!550
2019-12-30 15:36:17 -05:00
Jaime Passos
03a3b02301
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-25 05:43:46 -03:00
James R
9defd997c3
Merge branch 'fixsignalhandler' into 'master'
...
Handle signals correctly on linux
See merge request STJr/SRB2!530
2019-12-24 02:54:44 -05:00
James R
25525a6aae
symlink latest-log.txt on nix, copy to the real log file everywhere else
2019-12-23 18:20:04 -08:00
James R
8a23ff0bc8
Handle log file in parent properly
2019-12-13 16:51:49 -08:00
James R
6dcdb8d951
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
7c383e4a1f
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
Jaime Passos
0652ffd67f
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-12-11 21:53:47 -03:00
Jaime Passos
9248f12d55
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
MascaraSnake
0d22970c78
Change versionstring to 2.2.0
2019-12-06 23:47:05 +01:00
MascaraSnake
bf477c6ed4
Merge branch 'master' into nondevelop
2019-12-06 23:23:01 +01:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
toaster
fd6ecb4425
Make modid 18 to match Rob's work.
2019-12-06 17:23:55 +00:00
toaster
1684cf76bd
Make modversion 40 to match Rob's work.
2019-12-06 17:19:42 +00:00
toaster
9e38af7421
* Fix unintentional order-of-operations crash with non-DEVELOP executables ( resolves #461 ).
...
* Update md5s.
* Update modversion.
TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
2019-12-06 17:14:51 +00:00
Jaime Passos
1e4060af8c
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
c15ee65015
LEVELWIPES
2019-11-15 18:21:12 -03:00
Jaime Passos
10d1b63ff2
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
c6253bb6f9
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
Jaime Passos
c7d0d7b1c2
Flats as walls textures support, WIP, doesn't support animations yet
2019-11-09 01:36:53 -03:00
Jaime Passos
79e99dc471
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
James R
6358d839ee
Overhaul the map command
...
Added support for map names, matched by substring and keywords too!
Added support for two digit MAP codes without the MAP part.
Added support for decimal map number. (But who cares.)
Gave a better description of command.
Supported abbreviated optional parameters.
And now REALLY detects incorrect parameters.
2019-10-27 14:02:36 -07:00
James R
0b314a82bb
Use long double suffix
2019-10-22 21:48:15 -07:00
James R
29a5999a44
"NEWPING" might as well be the only ping
2019-10-22 19:39:26 -07:00
Jaime Passos
5118f8589d
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03:00
Jaime Passos
fe60902df5
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03:00
Steel Titanium
6a870b4467
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
Jaime Passos
8057eeaaca
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
Jaime Passos
6ab20060a7
Disable LUA_PATCH_SAFETY because I trust Lua scripters enough
...
haha........ha.................
2019-09-10 16:59:37 -03:00
Jaime Passos
26569f494b
lua stuff
2019-09-09 17:24:13 -03:00
Jaime Passos
f461b76bb0
fix translucency
2019-09-07 16:54:26 -03:00
Jaime Passos
0cc553be5f
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
Jaime Passos
1fca5a749e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-02 23:36:30 -03:00
Monster Iestyn
f3484f7ded
Merge branch 'public_next'
...
# Conflicts:
# src/config.h.in
# src/d_clisrv.c
# src/d_netcmd.c
# src/doomdef.h
# src/p_map.c
# src/p_maputl.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
Jaime Passos
f68652aa66
I
2019-08-18 14:16:48 -03:00
Monster Iestyn
e52a314ddb
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
Monster Iestyn
0ba2b28381
Disable patch.dta at Rob's request, since we don't really use it anymore
2019-08-11 20:24:14 +01:00
toaster
3efb49487e
Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready.
...
Just making this commit now so I can merge in master...
2019-07-04 14:09:38 +01:00
Jaime Passos
28566008b4
Merge remote-tracking branch 'upstream/master' into flats-png
2019-06-25 16:02:35 -03:00
toaster
3021116797
Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100.
...
Also: Making sure every single reserved tag is recorded as an LE_ constant.
2019-06-22 17:03:39 +01:00
Monster Iestyn
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Jaime Passos
39857a846a
PNG support
2019-05-26 23:37:23 -03:00
mazmazz
9ec98c588f
Merge branch 'public_next'
2019-03-14 22:15:34 -04: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
mazmazz
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
mazmazz
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
842bcfc8a0
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-25 00:19:45 -05:00
mazmazz
10a3e3fec9
Define EPSILONs only if not already defined
...
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
mazmazz
e9e5128754
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
Digiku
8d56c2f486
Merge branch 'addons-backport' into '2122-version'
...
Addons Menu backport to vanilla
See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
