Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
bc7686c16a
LEVELWIPES
2019-11-15 18:21:12 -03:00
Jaime Passos
499c724f9f
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
116fb2639e
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-10-28 14:29:10 -03:00
James R
b3f9bce439
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
ac36d13420
Use long double suffix
2019-10-22 21:48:15 -07:00
James R
4f5d32a73f
"NEWPING" might as well be the only ping
2019-10-22 19:39:26 -07:00
Jaime Passos
e2ce3988fb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03: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
Jaime Passos
27970e22e1
fix translucency
2019-09-07 16:54:26 -03:00
Jaime Passos
b28af03b1c
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
Jaime Passos
412e368ef4
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-02 23:36:30 -03:00
Monster Iestyn
0b6a463cff
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
402012e973
I
2019-08-18 14:16:48 -03:00
Monster Iestyn
a20079e410
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
Monster Iestyn
400cc8124a
Disable patch.dta at Rob's request, since we don't really use it anymore
2019-08-11 20:24:14 +01:00
toaster
c0f7cfaa8e
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
e0622c4489
Merge remote-tracking branch 'upstream/master' into flats-png
2019-06-25 16:02:35 -03:00
toaster
7d3e659f1f
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
474b70aa69
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Jaime Passos
75165ebb28
PNG support
2019-05-26 23:37:23 -03:00
mazmazz
2eb04ab17d
Merge branch 'public_next'
2019-03-14 22:15:34 -04: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
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
mazmazz
7deac7e603
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
818438d5d0
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-25 00:19:45 -05:00
mazmazz
59ac969594
Define EPSILONs only if not already defined
...
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
mazmazz
7c3dcd2bf9
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
Digiku
15c9404f91
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
77182e9278
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
4e055bd383
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
mazmazz
495ea70a74
Hardcode define MAJOREXECVERSION to MODVERSION
2018-12-20 17:16:04 -05:00
mazmazz
8e2d8ee797
Merge branch '2122-version' into 2122-execversion
2018-12-20 17:14:53 -05:00
mazmazz
92eb63d8b5
Update EXECVERSION to MODVERSION 27
2018-12-20 04:03:35 -05:00
mazmazz
8a6031ba01
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
mazmazz
1e731416d0
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
mazmazz
80d027ee47
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
mazmazz
77456cd593
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
Latapostrophe
34f13e9f20
merge conflict
2018-12-16 16:48:15 +01:00
Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
mazmazz
8c845510a4
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
Digiku
989bdfb85e
Merge branch 'debug_stuff' into 'master'
...
Debug tweaks
See merge request STJr/SRB2Internal!144
2018-11-21 16:41:51 -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
3e0ec0ed6e
clipping code didn't seem so bad this time (at least compared to without), let's enable it now?
2018-11-10 16:09:52 +00:00
Monster Iestyn
ad860e0d01
More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
...
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
Latapostrophe
a4bded8e9e
SRB2chat test rework
2018-07-31 11:10:02 +02:00
toaster
5fee30456f
* Patch.pk3 as requested by literally everyone else on the team.
...
* Enable SECTORSPECIALAFTERTHINK since we probably really want to use that sloped lava wave in RVZ.
* Allow for infinite lives to be set via the setlives command/Pandora's Box.
* Refactor P_DoFiring(), with guidance from Sal.
* Correct the CRAWLA HONCHO\nCAN NOW BECOME\nSUPER CRAWLA HONCHO sliding movement in non-green resolutions.
2018-06-06 14:42:50 +01:00
toasterbabe
cdc4dd4efe
DEVMODE visual output messed with a bit. NOT in master this time.
...
* DBG_PLAYER split out from DBG_DETAILED. (The difference I'm intending here is whether it's referring to stuff in the player struct, or stuff in the mobj struct.)
* Function pointer for text so both modes can show the same stuff if it's not taking over the entire screen, and only show the "INFO NOT AVAILABLE AT THIS RESOLUTION" if it's in danger of going off the bottom.
2018-04-08 14:31:56 +01:00