Sal
|
a9acd6a8e9
|
Merge branch 'split-netfil-loading' into 'next'
Speed up file loading on server join by splitting P_AddWadFile into stages
See merge request KartKrew/Kart-Public!295
|
2022-09-05 15:04:49 +00:00 |
|
X.organic
|
6fb59f87b7
|
Speed up file loading on server join by splitting P_AddWadFile into stages
|
2022-09-05 15:04:49 +00:00 |
|
X.organic
|
70128776ac
|
Miscellaneous memory bug fixes to make AddressSanitizer happy
|
2022-09-02 13:20:31 +00:00 |
|
James R
|
c6e3f780e7
|
Revert "Merge branch 'consoleplayer-dedicated' into 'next'"
This reverts commit 5ec44ba3fa , reversing
changes made to 4c5d69b714 .
|
2022-08-18 18:14:23 -07:00 |
|
toaster
|
71f2d638e6
|
Merge branch 'next' of https://git.do.srb2.org/KartKrew/Kart-Public.git into public_next
# Conflicts:
# src/f_finale.c
|
2021-12-02 17:42:50 +00:00 |
|
SteelT
|
fd88c139a6
|
Merge branch 'master' into next
|
2021-11-21 16:01:29 -05:00 |
|
Ashnal
|
6e7bdc6031
|
Changed readfreeslots error checking to work like lib_freeslot
Uses loop variable to determine error condition
Also small change to lib_freeslot for SFX for consistent use of I_Error
|
2021-09-06 16:12:33 -04:00 |
|
Ashnal
|
f5bcfc6379
|
Add I_Errors for when the game exhausts all freeslots of any type.
|
2021-09-06 16:11:57 -04:00 |
|
lachablock
|
62529f748a
|
Add Opulence objects
|
2021-07-24 19:08:04 +10:00 |
|
James R
|
1a3e883b4e
|
Lua: "defrosting" global to tell how many tics are processing in the preticker
|
2020-11-24 19:32:01 -08:00 |
|
Sal
|
5ec44ba3fa
|
Merge branch 'consoleplayer-dedicated' into 'next'
Fix not being able to access consoleplayer as a dedicated server + other more consistent checks
See merge request KartKrew/Kart-Public!240
|
2020-11-10 14:50:22 -05:00 |
|
Louis-Antoine
|
ab7ccbc5d5
|
Expose "server" and "dedicated" to Lua scripts
Careful! Both are local variables and are always false for clients,
and therefore should obviously not be used in anything gamelogic-related.
|
2020-11-05 20:19:58 -08:00 |
|
James R
|
933ee4e961
|
COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd
|
2020-11-05 20:16:28 -08:00 |
|
James R
|
bb97e0805e
|
Fuck magic numbers; COM_ flags for Lua commands!
|
2020-11-05 20:16:26 -08:00 |
|
James R
|
29d8e44055
|
Always allow access to the serverplayer
|
2020-11-05 20:00:21 -08:00 |
|
Sal
|
1aca163d12
|
Merge branch 'discord-rpc-support' into 'next'
Discord Rich Presence
See merge request KartKrew/Kart-Public!207
|
2020-08-30 21:48:44 -04:00 |
|
Steel Titanium
|
35122d3a22
|
Expose demo.playback to Lua
|
2020-08-27 14:58:46 -04:00 |
|
Sally Coolatta
|
e2f3e76db8
|
Merge branch 'next' into discord-rpc-support
|
2020-08-23 05:32:32 -04:00 |
|
Sally Coolatta
|
7d380c326b
|
Merge branch 'master' into next
|
2020-08-23 04:44:27 -04:00 |
|
lachwright
|
32f2ed4a53
|
Correct misplaced MT_ARIDTOAD listing
|
2020-08-22 17:35:31 +08:00 |
|
FlykeSpice
|
00137ef4ea
|
Remove ESLOPE #ifdef(backport from srb2 2.2)
|
2020-08-20 13:02:13 -04:00 |
|
Sally Coolatta
|
d709e9782d
|
Use curl to retrieve your own IP address properly
|
2020-08-17 00:29:52 -04:00 |
|
Sally Coolatta
|
47f95e22d5
|
Allow lowercase level name / zone title
Might have some other side-effects, we'll need to see
|
2020-08-16 22:13:21 -04:00 |
|
Wolfy
|
da2a640c6c
|
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
|
2020-04-11 23:47:25 -05:00 |
|
Latapostrophe
|
37c733b8c2
|
More explicit var names for countdown and countdown2
|
2020-03-11 07:37:33 +01:00 |
|
Latapostrophe
|
2e5608d33b
|
Push race countdowns and functions to set them
|
2020-03-10 12:57:30 +01:00 |
|
Latapostrophe
|
8c00331c2b
|
Push consoleplayer and displayplayers to Lua
|
2020-03-10 11:53:28 +01: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 |
|
Latapostrophe
|
93740dc854
|
add k_booostangle to dehacked
|
2019-05-25 14:11:26 +02: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 |
|
TehRealSalt
|
f720dd3ddb
|
Merge v1
|
2019-05-06 21:23:29 -04:00 |
|
Sal
|
2dc91d1723
|
Merge branch 'skins-fix' into 'v1'
Remove skin shit
See merge request KartKrew/Kart!145
|
2019-05-06 21:07:24 -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 |
|
Sryder
|
1f1d67cd7e
|
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
# Conflicts:
# src/p_user.c
|
2019-05-06 20:20:57 +01:00 |
|
TehRealSalt
|
98dbdd7db5
|
Don't allow custom gamedata to overwrite kart gamedata or replay folders
|
2019-05-02 12:58:02 -04:00 |
|
TehRealSalt
|
9e15486926
|
Fix warnings
Remove entries from dehacked, remove P_DoJump, remove debug stuff
|
2019-05-02 02:51:13 -04: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 |
|
TehRealSalt
|
1f61397545
|
Huge splitscreen refactor
Did not get to finish all refactoring or even compile this, I'll continue later
|
2019-04-18 03:08:11 -04:00 |
|
Steel Titanium
|
d59fb7f80c
|
Expose cv_numlaps as global variable
|
2019-04-06 23:42:02 -04:00 |
|
fickleheart
|
4b7d2aea84
|
Move public demo vars to a single struct
|
2019-03-24 21:32:15 -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 |
|
mazmazz
|
6cf05a4613
|
Implement MUSICINTERFADEOUT level header
|
2019-03-15 01:05:52 -04:00 |
|
mazmazz
|
bd9e42ce6e
|
Merge branch 'public-gl-next' into public-musicplus-inter
|
2019-03-14 23:42:16 -04:00 |
|
mazmazz
|
93626c2293
|
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
|
2019-03-13 19:45:07 -04:00 |
|
fickleheart
|
bae86bbca4
|
Oh, this was already here...
|
2019-03-12 08:39:25 -05:00 |
|
fickleheart
|
ee3580098b
|
Add missing deh entry for k_starpostflip
|
2019-03-12 07:34:47 -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 |
|