Monster Iestyn
389e7d415d
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
...
(cherry picked from commit 89cd756cd83e4a03a34d1f16da18142d8167d889)
2020-05-15 09:52:16 -07: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
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
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
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
Jaime Passos
47ae715962
Hardware mode y-shearing matches software mode mouselook
2019-05-17 17:49:04 -03: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
wolfs
f4947820e4
Merge branch 'maxskins-bump' into 'next'
...
Bump MAXSKINS to 128 + Clean up skin struct
See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
fickleheart
ebee7232c7
Make sure Fairy is before Popcorn
2019-03-11 00:10:03 -05:00
Sal
897331a289
Merge branch 'colors-roundtwo' into 'next'
...
16 more colors
See merge request KartKrew/Kart-Public!101
2019-03-07 21:25:03 -05:00
wolfy852
0829040f6c
Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump
2019-03-06 20:13:30 -06:00
Sally Cochenour
5d0fbc2af0
Reorder colors, ensure colored names are set properly
2019-03-06 03:15:07 -05:00
James R
e55a778a81
Merge remote-tracking branch 'origin/next' into longdouble
2019-03-04 18:51:11 -08:00
James R
ca861ba0c5
Use long double suffix
2019-03-02 15:56:44 -08:00
Sally Cochenour
d638d47fad
16 more colors
...
- Renamed Crimson to Maroon.
- Renamed Scarlet back to Crimson.
- Renamed Nova to Scarlet.
- Added Brick, Flame, Sunset, Popcorn, Camouflage, Caribbean, Plague, Platinum, Rust, Nova, Ultraviolet, Moonslam, Bubblegum, Mauve, Royal, and Fairy
- Updated Maroon, Robo-Hood, and Ketchup
- Shifted positioning of Aqua Super
2019-03-02 15:39:52 -05:00
Sally Cochenour
008d9c9dc0
10 new colors
...
new Crimson (old Crimson was renamed to Scarlet), new Peach (the replacement from last commit was renamed to Cream), Cherry, Nova, Copper, Handheld, Algae, Pastel, Fuchsia, and Toxic. Also, updated Robo-Hood.
2019-02-27 00:08:13 -05:00
Sally Cochenour
d88d8adf4c
Fix Super colors from base SRB2 giving a garbage color
2019-02-26 07:14:03 -05:00
wolfy852
f9961a87ff
Bump MAXSKINS to 128
...
Can't believe people actually need this now.
2019-02-20 18:55:53 -06:00
fickleheart
0b92743244
Support netreplays in titledemos
...
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -06:00
Sally Cochenour
41e5b16920
Update version
2019-02-04 22:00:36 -05:00
TehRealSalt
19329f9a4a
bump maxskins to 64, fix overflow error
2019-01-14 18:16:07 -05:00
Marco Z
74c57ad447
Kart Public Next merge
2019-01-08 18:43:49 -05:00
wolfy852
5c5e6a26dd
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
SeventhSentinel
3fe7856ba3
Keep execversion stuff on, just dummied out
...
Had issues with skin values not changing from the menu, this seemed to fix it
2019-01-06 01:41:42 -05:00
