Jaime Passos
499c724f9f
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
Jaime Passos
486df5ea7a
Flats as walls textures support, WIP, doesn't support animations yet
2019-11-09 01:36:53 -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
James
83c4017993
Another round of small color tweaks
2019-10-21 08:35:17 -04:00
Jaime Passos
e2ce3988fb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03:00
Jaime Passos
e95bd8add3
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -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
TehRealSalt
77aeb4663b
Merge branch 'master' into versus-record
2019-09-23 07:03:56 -04:00
TehRealSalt
932f8a1f61
Update demos to save power levels
2019-09-23 07:03:00 -04:00
Jaime Passos
ce8b821691
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
Jaime Passos
356e3c274d
Disable LUA_PATCH_SAFETY because I trust Lua scripters enough
...
haha........ha.................
2019-09-10 16:59:37 -03:00
Jaime Passos
59f403d67b
lua stuff
2019-09-09 17:24:13 -03: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
James R
374af9a322
Merge remote-tracking branch 'pub/master' into public-master
2019-07-17 12:33:20 -07: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
Sryder
3d6161c7ca
Fix compatibility with the MS (Specifically Doomseeker)
...
Send back 32 players worth of playerinfo regardless of MAXPLAYERS. Fill the extra with unconnected nodes.
2019-06-17 21:04:48 +01:00
Jaime Passos
a37d742561
software is better
2019-06-13 21:10:01 -03:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
Monster Iestyn
474b70aa69
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Sal
2ce77fdce9
Merge branch 'rings' into 'master'
...
Rings
See merge request KartKrew/Kart!128
2019-05-30 01:58:34 -04:00
TehRealSalt
8ca96168b9
enable patch file
2019-05-29 23:19:52 -04:00
TehRealSalt
4f13f8b98e
Change version num to v2, disable 1.0.x demo compatiblity
2019-05-29 22:29:06 -04:00
Jaime Passos
75165ebb28
PNG support
2019-05-26 23:37:23 -03:00
Jaime Passos
47ae715962
Hardware mode y-shearing matches software mode mouselook
2019-05-17 17:49:04 -03:00
TehRealSalt
407344299c
Rename colors
...
My attempt at compromise didn't work, so I'll just have it my way
2019-05-14 21:00:40 -04:00
TehRealSalt
ddaf5658d5
Finish skincolors
...
The only thing remaining is super colors, but I'm not too fussed about that for a merge request because
2019-05-13 23:21:07 -04:00
TehRealSalt
da7e79ac83
Adjust file loading
...
Many files converted to pk3, and we now have a distinct IWAD
2019-05-12 20:58:26 -04:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
Sal
1c1435aea7
Merge branch 'version-prep' into 'master'
...
Version prep
See merge request KartKrew/Kart!148
(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)
2e221946359d06f13a707c09889ead782d9ae1abe954f0b45316e63a55db226826159aae
2019-05-06 22:05:56 -04:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
wolfy852
f808072937
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/hw_main.h
# src/m_menu.c
# src/r_main.c
# src/v_video.c
2019-05-06 14:26:09 -05:00
TehRealSalt
032a755ef7
Remove unique version number
2019-05-02 01:34:25 -04:00
Jaime Passos
2a3e885b9a
01052019
2019-05-01 19:37:42 -03:00
Jaime Passos
c0c0576151
Match Kart-Public's next since it got merged anyway
...
and fix something else
2019-04-30 20:59:32 -03:00
TehRealSalt
2e22194677
Final v1 colors
...
- 11 new colors: Skunk, Artichoke, Pigeon, Walnut, Cinnamon, Lemonade, Quarry, Crocodile, Azure, Thunder, & Wristwatch
- Updated Dawn, Sunset, Cream, Gold, Olive, Vomit, Lime, Plague, & Caribbean
- Updated opposite colors for Bubblegum & Camouflage in response to the new colors
2019-04-26 18:18:53 -04:00
James R
03c27101df
"NEWPING" might as well be the only ping
2019-04-08 15:48:20 -07:00
