Commit graph

228 commits

Author SHA1 Message Date
Eidolon
08a218a3a1 Bump execversion to 10, remap xbox controls to SDL 2022-08-25 20:28:13 -05:00
X.organic
d820b8e0c7
Increase maximum skin count to 255
This time without spare slots, because I don't see shenanigans like
WAD_MUSIC happening with skin indices. Verified to work by saving a
replay with 139 skins as the 133th skin and playing it back a few times.
Shouldn't cause issues with netcode either because there are no SINT8s
handling skin indices.
2022-08-20 14:08:14 +02:00
James R
993b3c96ac Update version to 1.5 2022-08-19 21:19:42 -07:00
toaster
a091420764 Actually update CMakeLists.txt for real.
And add a little extra to the comment for anti-footgun insurance.
2022-07-17 22:03:57 +01:00
toaster
1c961e60f3 Primary 1.4 prep.
* New version number.
* New MODVERSION.
* New asset hashes.
* Disable patch.kart requirement.
* Remove the request to modify CMakeLists.txt, because that got revamped and grabs the version number from elsewhere now.
2022-07-17 21:15:27 +01:00
James R
6609b90457 Update update alert message 2020-09-11 20:12:31 -07:00
James R
7ab1c4a2df Update versions to 1.3 2020-08-30 19:06:31 -07:00
James R
daf6e66268 Fix stupid NONET
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
2020-08-29 18:19:39 -07:00
James R
3437b0690a Kill NOHS 2020-08-24 17:58:39 -07:00
Sally Coolatta
3ce6b8a54f Fix version string 2020-08-23 04:44:05 -04:00
FlykeSpice
00137ef4ea Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
James R
7a05a8acf7 Do not do master server things when NOCURL 2020-08-16 21:42:58 -07:00
James R
9b3456a860 Merge remote-tracking branch 'origin/master' into http-mserv 2020-06-12 23:36:39 -07:00
Monster Iestyn
05c8865528 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
9dc72f46a2 Identify this branch with VERSIONSTRING
This is temporary.
2020-05-12 19:27:54 -07:00
James R
820d4a5f8b SRB2APPLICATION: this is jart! 2020-04-20 20:22:17 -07:00
James R
4ed99c60bb 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
f9dad05242 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
1fac0505a4 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
0a50317e49 oops 2020-04-12 22:47:22 -05:00
Wolfy
bceeaf78bc Prep stuff
pending asset hash changes
2020-04-12 20:48:11 -05:00
James R
2a016332c4 Handle log file in parent properly 2019-12-16 19:28:42 -08:00
James R
9efe4d8445 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
2b837726eb 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
9ecc48d0e4 Merge remote-tracking branch '[remote name redacted]/jimita-shaders'
# Conflicts:
#	src/hardware/hw_main.c
2019-12-01 11:58:24 -06:00
Sryder
935fec1e15 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
5e14fd4ae4 software is better 2019-06-13 21:10:01 -03:00
Latapostrophe
ff04e0c103 chaos conflict 2019-06-11 17:02:47 +02:00
Jaime Passos
de5e44cfbc Merge remote-tracking branch 'upstream/master' into gl_shaders 2019-06-10 16:21:46 -03:00
Monster Iestyn
6f6d912fa6 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
Jaime Passos
d3dfd77ae7 Hardware mode y-shearing matches software mode mouselook 2019-05-17 17:49:04 -03:00
wolfy852
f61f7f4411 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
2c363c4e1e 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
5022cde443 Merge branch 'version-prep' into 'master'
Version prep

See merge request KartKrew/Kart!148

(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)

183e75ff Final v1 colors
9629fb32 Modify the first shade of Byzantium
39bea80b Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
f99a5a6a Fix wheel animations
fd148ec2 Dumbass typo
e772a750 Missed a spot
3d71a0aa Merge branch 'next-colors' into 'v1'
071b335d Merge branch 'anim-fix' into 'v1'
0cd815cb Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
2019-05-06 22:05:56 -04:00
TehRealSalt
f720dd3ddb Merge v1 2019-05-06 21:23:29 -04:00
wolfy852
97493fdfd7 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
4638722632 Remove unique version number 2019-05-02 01:34:25 -04:00
Jaime Passos
0bc8d2a49d 01052019 2019-05-01 19:37:42 -03:00
Jaime Passos
2ff4a3ca75 Match Kart-Public's next since it got merged anyway
and fix something else
2019-04-30 20:59:32 -03:00
TehRealSalt
183e75ff53 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
42d47a10f3 "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
Jaime Passos
fa7f627c88 stuff 2019-04-06 23:33:34 -03:00
fickleheart
7af0554aba Prepare for a demo format upgrade! 2019-03-24 17:47:24 -05:00
fickleheart
7fc1f02b07 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
1cfdd07ee0 gl4 2019-03-17 22:27:50 -03:00
fickleheart
3aa1e78345 Update version and patch hash 2019-03-11 22:40:15 -05:00
wolfs
24b5079f20 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
af67c7abf5 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
3de3f10ad3 Make sure Fairy is before Popcorn 2019-03-11 00:10:03 -05:00
Sal
4f8665c785 Merge branch 'colors-roundtwo' into 'next'
16 more colors

See merge request KartKrew/Kart-Public!101
2019-03-07 21:25:03 -05:00