Sally Coolatta
249fff87ad
Merge branch 'new-cars-movie' into colorize-tweak
2020-05-12 22:46:46 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
45e2f03846
New colors
...
- Removed Salmon, Robo-Hood, Caribbean, and Azure.
- Added Skunk, Robin, Blueberry, and Blossom.
- Updated Lime, Algae, Violet and Magenta.
- Renamed old Blueberry to Midnight.
2020-05-11 23:46:37 -04:00
James R
b8942a5e68
SRB2APPLICATION: this is jart!
2020-04-20 20:22:17 -07:00
James R
2111cc2be6
More fine tuned versioning
...
You get a PACKETVERSION, for when some packets change format.
You get SRB2APPLICATION, for when you have big fucking mod.
(cherry picked from commit 6bd383621eee92b215f86c9c4b483934d7e60daa)
2020-04-20 19:59:42 -07:00
wolfs
fb0e699aec
Merge branch 'fixsignalhandler-resurrection' into 'awful-mix'
...
2.2 signal handler
See merge request SinnamonLat/Kart-Public!11
2020-04-20 22:42:59 -04:00
Sally Cochenour
53784f9940
No more modulo bullshit in VERSION
...
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision
# Conflicts:
# src/doomdef.h
2020-04-12 23:32:15 -05:00
Sally Cochenour
da953c9dae
No more modulo bullshit in VERSION
...
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision
2020-04-12 23:51:00 -04:00
Wolfy
e1ab32a459
oops
2020-04-12 22:47:22 -05:00
Wolfy
30f5e928dd
Prep stuff
...
pending asset hash changes
2020-04-12 20:48:11 -05:00
Sal
eb9144338a
Merge branch 'logs-port' into 'master'
...
2.2 directory structure and log files port
See merge request KartKrew/Kart!224
2020-03-28 22:16:50 -04:00
James R
10a9a05cd8
symlink latest-log.txt on nix, copy to the real log file everywhere else
...
(cherry picked from commit 25525a6aae84581ac03ca3089950ad4ff25b8512)
2020-03-24 15:49:08 -07:00
James R
310a9cd09c
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 17:22:57 -07:00
James R
46ac563eaf
Implement big bad parties (splitscreen with network players)
...
Use the 'invite' command to invite another player to your party.
If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.
Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
2020-02-23 23:20:20 -08:00
James R
15ac2982c0
Handle log file in parent properly
2019-12-16 19:28:42 -08:00
James R
e961a901e4
Move everything to i_system.c
...
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-16 19:27:53 -08:00
James R
c6a882f303
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-16 19:27:35 -08:00
fickleheart
7025a23f25
Merge remote-tracking branch '[remote name redacted]/jimita-shaders'
...
# Conflicts:
# src/hardware/hw_main.c
2019-12-01 11:58:24 -06:00
James
83c4017993
Another round of small color tweaks
2019-10-21 08:35:17 -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
James R
374af9a322
Merge remote-tracking branch 'pub/master' into public-master
2019-07-17 12:33:20 -07: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
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
Jaime Passos
fbc3e27592
stuff
2019-04-06 23:33:34 -03:00
fickleheart
d13134bae2
Prepare for a demo format upgrade!
2019-03-24 17:47:24 -05:00
fickleheart
be458c1d05
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00
Jaime Passos
fd5fb73671
gl4
2019-03-17 22:27:50 -03:00
fickleheart
0a22f07751
Update version and patch hash
2019-03-11 22:40:15 -05:00
wolfs
2195709d31
Merge branch 'color-flip' into 'next'
...
Fix color enums more
See merge request KartKrew/Kart-Public!112
2019-03-11 19:28:24 -04:00
