Commit Graph

171 Commits

Author SHA1 Message Date
Jaime Passos 6a5ea548e6 make ROTANGLES be 360 2019-12-17 13:00:50 -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 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
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 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
Digiku 7a64e3d1a8 Merge branch 'SRB2-CHAT' into '2122-version'
Chat and other multiplayer quality of life improvements.

See merge request STJr/SRB2!398
2018-12-23 17:53:54 -05:00
mazmazz f1fea30045 Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
mazmazz 9be1ee4ac7 Hardcode define MAJOREXECVERSION to MODVERSION 2018-12-20 17:16:04 -05:00
mazmazz 6affe807e8 Merge branch '2122-version' into 2122-execversion 2018-12-20 17:14:53 -05:00
mazmazz 04916edc07 Update EXECVERSION to MODVERSION 27 2018-12-20 04:03:35 -05:00
mazmazz 9d212b340b Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
mazmazz 969960a1eb Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz 657e7321f6 Decouple execversion from MODVERSION; add scheme for MINORMODVERSION 2018-12-17 13:38:23 -05:00
mazmazz 6d94568f4b Hide kart-specific addons behavior behind USE_KART 2018-12-16 16:07:47 -05:00
Latapostrophe 25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
Monster Iestyn 33c1ac33f5 Merge branch 'next' into 21-version
# Conflicts:
#	src/d_netcmd.c
2018-12-02 15:45:07 +00:00
mazmazz ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz 36e020c366 Update version to 2.1.21 2018-11-23 06:58:45 -05:00
Digiku e599428442 Merge branch 'debug_stuff' into 'master'
Debug tweaks

See merge request STJr/SRB2Internal!144
2018-11-21 16:41:51 -05:00