diff --git a/README.md b/README.md index d71a56e..cbbd4a3 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,7 @@ * **Client-Mod** is a small modification of the **Half-Life** client part for **Xash3D FWGS and GoldSource** -Added a new control with additional buttons to activate `Configuration->Touch->Touch options`, select preset `New` and click `Activate`. - -Added server name to no vgui scoreboard, player model name (included in vgui), curent map name, number of current players, and current date with time. +Added server name to no vgui scoreboard, player model name (included in vgui), curent map name and number of current players. Added commands: @@ -95,7 +93,7 @@ cl_viewmodel_ofs_right [value] — Offsets the gun viewmodel to the right (or to cl_viewmodel_ofs_forward [value] — Offsets the gun viewmodel forward, 0 for no offset. Taken from OpenAG. cl_viewmodel_ofs_up [value] — Offsets the gun viewmodel upwards, 0 for no offset. Taken from OpenAG. -cl_debug [1/0] - Show client info, defaut value 0. +cl_debug [0/1/2] - Show client info, defaut value 0. cl_debug_showfps [1/0] - Show curent fps and framerate, defaut value 1. ``` @@ -251,12 +249,6 @@ aarch64-none-elf-cmake -G"Unix Makefiles" -DCMAKE_PROJECT_CLIENT-MOD_INCLUDE="$D make -j ``` -### Building using waf -``` -./waf configure -T release --nswitch -./waf build -``` - ## PlayStation Vita ### Prerequisites @@ -270,12 +262,6 @@ make -j make -j2 install ``` -### Building with waf: -``` -./waf configure -T release --psvita -./waf build -``` - ### Building with CMake: ``` mkdir build && cd build @@ -298,15 +284,6 @@ cmake -B build -S . cmake --build build ``` -### Building with waf - -To use waf, you need to install python (2.7 minimum) - -``` -(./waf configure -T release) -(./waf) -``` - ## Build options Some useful build options that can be set during the cmake step. diff --git a/android/app/src/main/assets/customconfig.cfg b/android/app/src/main/assets/customconfig.cfg deleted file mode 100644 index 7054149..0000000 --- a/android/app/src/main/assets/customconfig.cfg +++ /dev/null @@ -1,23 +0,0 @@ -//crossbow fastzoom -alias +fastzoom "+attack2;wait;wait;+attack;wait;-attack;wait;-attack2" -alias -fastzoom "wait;lastinv;wait;lastinv;wait" - -//bunnyhop move -alias "+mr" "+moveright;+right" -alias "-mr" "-moveright;-right" -alias "+ml" "+moveleft;+left" -alias "-ml" "-moveleft;-left" - -//double duck -alias "+dd" "+duck;wait;-duck;wait;+duck;wait" -alias "-dd" "-duck" - -//Long jump script -alias "+lj" "+duck;wait;+jump" -alias "-lj" "-jump;wait;-duck" - -con_color "255 255 255" -con_notifytime -1 -mp_bhopcap 0 -cl_lc 1 -cl_lw 1 diff --git a/android/app/src/main/assets/touch/crossbow.png b/android/app/src/main/assets/touch/crossbow.png deleted file mode 100644 index 6f0a8fd..0000000 Binary files a/android/app/src/main/assets/touch/crossbow.png and /dev/null differ diff --git a/android/app/src/main/assets/touch/crowbar.png b/android/app/src/main/assets/touch/crowbar.png deleted file mode 100644 index 6916d46..0000000 Binary files a/android/app/src/main/assets/touch/crowbar.png and /dev/null differ diff --git a/android/app/src/main/assets/touch/fzoom.png b/android/app/src/main/assets/touch/fzoom.png deleted file mode 100644 index 72f1f2b..0000000 Binary files a/android/app/src/main/assets/touch/fzoom.png and /dev/null differ diff --git a/android/app/src/main/assets/touch/gauss.png b/android/app/src/main/assets/touch/gauss.png deleted file mode 100644 index 1fb0820..0000000 Binary files a/android/app/src/main/assets/touch/gauss.png and /dev/null differ diff --git a/android/app/src/main/assets/touch/mp5.png b/android/app/src/main/assets/touch/mp5.png deleted file mode 100644 index 91661ab..0000000 Binary files a/android/app/src/main/assets/touch/mp5.png and /dev/null differ diff --git a/android/app/src/main/assets/touch/none.png b/android/app/src/main/assets/touch/none.png deleted file mode 100644 index bc3b6be..0000000 Binary files a/android/app/src/main/assets/touch/none.png and /dev/null differ diff --git a/android/app/src/main/assets/touch/reload.png b/android/app/src/main/assets/touch/reload.png deleted file mode 100644 index 8baba44..0000000 Binary files a/android/app/src/main/assets/touch/reload.png and /dev/null differ diff --git a/android/app/src/main/assets/touch/shotgun.png b/android/app/src/main/assets/touch/shotgun.png deleted file mode 100644 index 2b84d2d..0000000 Binary files a/android/app/src/main/assets/touch/shotgun.png and /dev/null differ diff --git a/android/app/src/main/assets/touch/strafe.png b/android/app/src/main/assets/touch/strafe.png deleted file mode 100644 index 8f607c3..0000000 Binary files a/android/app/src/main/assets/touch/strafe.png and /dev/null differ diff --git a/android/app/src/main/assets/touch_profiles/new.cfg b/android/app/src/main/assets/touch_profiles/new.cfg deleted file mode 100644 index a69227c..0000000 --- a/android/app/src/main/assets/touch_profiles/new.cfg +++ /dev/null @@ -1,80 +0,0 @@ -//======================================================================= -// Copyright SDLash3D team & XashXT group 2022 © -// touchscreen config -//======================================================================= - -touch_config_file "touch_profiles/new.cfg" - -// touch cvars - -// sensitivity settings -touch_pitch "90.000000" -touch_yaw "120.000000" -touch_forwardzone "0.060000" -touch_sidezone "0.060000" -touch_nonlinear_look "0" -touch_pow_factor "1.300000" -touch_pow_mult "400.000000" -touch_exp_mult "0.000000" - -// grid settings -touch_grid_count "100" -touch_grid_enable "1" - -// global overstroke (width, r, g, b, a) -touch_set_stroke 1 156 77 20 200 - -// highlight when pressed -touch_highlight_r "1.000000" -touch_highlight_g "1.000000" -touch_highlight_b "1.000000" -touch_highlight_a "1.000000" - -// _joy and _dpad options -touch_dpad_radius "1.000000" -touch_joy_radius "1.000000" - -// how much slowdown when Precise Look button pressed -touch_precise_amount "0.500000" - -// enable/disable move indicator -touch_move_indicator "0" - -// reset menu state when execing config -touch_setclientonly 0 - -// touch buttons -touch_removeall -touch_addbutton "look" "" "_look" 0.500000 -0.021222 1.000000 0.997444 255 255 255 255 0 -touch_addbutton "move" "" "_move" 0.000000 0.000000 0.500000 0.997444 255 255 255 255 0 -touch_addbutton "tduck" "touch_default/tduck.png" ";+duck" 0.910000 0.191000 0.970000 0.318333 255 255 255 30 1 -touch_addbutton "mp5" "touch/mp5.png" "use weapon_9mmAR" 0.830000 0.297111 0.890000 0.424444 255 255 255 30 0 -touch_addbutton "fastzoom2" "touch/fzoom.png" "+fastzoom" 0.750000 0.297111 0.810000 0.424444 255 255 255 30 0 -touch_addbutton "shotgun" "touch/shotgun.png" "use weapon_shotgun" 0.670000 0.297111 0.730000 0.424444 255 255 255 30 0 -touch_addbutton "crowbar" "touch/crowbar.png" "use weapon_crowbar" 0.670000 0.148556 0.730000 0.275889 255 255 255 30 0 -touch_addbutton "crossbow" "touch/crossbow.png" "use weapon_crossbow" 0.750000 0.148556 0.810000 0.275889 255 255 255 30 0 -touch_addbutton "gauss" "touch/gauss.png" "use weapon_gauss" 0.830000 0.148556 0.890000 0.275889 255 255 255 30 0 -touch_addbutton "scores" "touch_default/map.png" "+showscores" 0.780000 0.000000 0.840000 0.127333 255 255 255 30 8 -touch_addbutton "messagemode" "touch_default/keyboard.png" "messagemode" 0.860000 0.000000 0.920000 0.127333 255 255 255 30 0 -touch_addbutton "savequick" "touch_default/save.png" "savequick" 0.860000 0.000000 0.920000 0.127333 255 255 255 30 16 -touch_addbutton "loadquick" "touch_default/load.png" "loadquick" 0.780000 0.000000 0.840000 0.127333 255 255 255 30 16 -touch_addbutton "menu" "touch_default/menu.png" "exec cmd/cmd" 0.700000 0.000000 0.760000 0.127333 255 255 255 30 0 -touch_addbutton "edit" "touch_default/settings.png" "touch_enableedit" 0.620000 0.000000 0.680000 0.127333 255 255 255 30 0 -touch_addbutton "show_numbers" "touch_default/show_weapons.png" "exec touch_default/numbers.cfg" 0.310000 0.912556 0.430000 0.997444 255 255 255 30 0 -touch_addbutton "jump" "touch_default/jump.png" "+jump" 0.910000 0.509333 0.990000 0.679111 255 255 255 30 0 -touch_addbutton "lastinv" "touch/reload.png" "lastinv" 0.910000 0.360778 0.970000 0.488111 255 255 255 30 0 -touch_addbutton "spray" "touch_default/spray.png" "impulse 201" 0.540000 0.000000 0.600000 0.127333 255 255 255 21 0 -touch_addbutton "attack/2" "touch_default/shoot_alt.png" "+attack2" 0.700000 0.445667 0.780000 0.615444 255 255 255 30 0 -touch_addbutton "attack2" "touch_default/shoot_alt.png" "+attack2" 0.120000 0.445667 0.220000 0.657889 255 255 255 30 0 -touch_addbutton "attack" "touch_default/shoot.png" "+attack" 0.240000 0.466889 0.320000 0.636667 255 255 255 30 0 -touch_addbutton "fastzoom" "touch/fzoom.png" "+fastzoom" 0.190000 0.254667 0.270000 0.424444 255 255 255 30 0 -touch_addbutton "doubleduck" "touch_default/crouch.png" "+dd" 0.740000 0.848889 0.810000 0.997444 0 255 255 30 0 -touch_addbutton "use" "touch_default/use.png" "+use" 0.640000 0.848889 0.710000 0.997444 255 255 255 30 0 -touch_addbutton "attack/1" "touch_default/shoot.png" "+attack" 0.660000 0.657889 0.740000 0.827667 255 255 255 30 0 -touch_addbutton "longjump" "touch_default/jump.png" "+lj" 0.850000 0.764000 0.970000 0.997444 255 112 255 30 0 -touch_addbutton "ml" "touch/strafe.png" "+ml" 0.030000 0.806444 0.130000 0.933778 255 255 255 30 0 -touch_addbutton "mr" "touch/strafe.png" "+mr" 0.140000 0.806444 0.240000 0.933778 255 255 255 30 0 -touch_addbutton "invprev" "touch_default/prev_weap.png" "invprev" 0.000000 0.169778 0.090000 0.360778 255 255 255 30 0 -touch_addbutton "reload" "touch_default/reload.png" "+reload" 0.000000 0.382000 0.090000 0.573000 255 255 255 30 0 -touch_addbutton "invnext" "touch_default/next_weap.png" "invnext" 0.000000 0.594222 0.090000 0.785222 255 255 255 30 0 -touch_addbutton "flashlight" "touch_default/flash_light_filled.png" "impulse 100" 0.940000 0.000000 1.000000 0.127333 255 255 255 30 0 diff --git a/dist/include/discord_register.h b/dist/include/discord_register.h deleted file mode 100644 index 16fb42f..0000000 --- a/dist/include/discord_register.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#if defined(DISCORD_DYNAMIC_LIB) -#if defined(_WIN32) -#if defined(DISCORD_BUILDING_SDK) -#define DISCORD_EXPORT __declspec(dllexport) -#else -#define DISCORD_EXPORT __declspec(dllimport) -#endif -#else -#define DISCORD_EXPORT __attribute__((visibility("default"))) -#endif -#else -#define DISCORD_EXPORT -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -DISCORD_EXPORT void Discord_Register(const char* applicationId, const char* command); -DISCORD_EXPORT void Discord_RegisterSteamGame(const char* applicationId, const char* steamId); - -#ifdef __cplusplus -} -#endif diff --git a/dist/include/discord_rpc.h b/dist/include/discord_rpc.h deleted file mode 100644 index 9470434..0000000 --- a/dist/include/discord_rpc.h +++ /dev/null @@ -1,90 +0,0 @@ -#pragma once -#include - -// clang-format off - -#if defined(DISCORD_DYNAMIC_LIB) -# if defined(_WIN32) -# if defined(DISCORD_BUILDING_SDK) -# define DISCORD_EXPORT __declspec(dllexport) -# else -# define DISCORD_EXPORT __declspec(dllimport) -# endif -# else -# define DISCORD_EXPORT __attribute__((visibility("default"))) -# endif -#else -# define DISCORD_EXPORT -#endif - -// clang-format on - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct DiscordRichPresence { - const char* state; /* max 128 bytes */ - const char* details; /* max 128 bytes */ - int64_t startTimestamp; - int64_t endTimestamp; - const char* largeImageKey; /* max 32 bytes */ - const char* largeImageText; /* max 128 bytes */ - const char* smallImageKey; /* max 32 bytes */ - const char* smallImageText; /* max 128 bytes */ - const char* partyId; /* max 128 bytes */ - int partySize; - int partyMax; - int partyPrivacy; - const char* matchSecret; /* max 128 bytes */ - const char* joinSecret; /* max 128 bytes */ - const char* spectateSecret; /* max 128 bytes */ - int8_t instance; -} DiscordRichPresence; - -typedef struct DiscordUser { - const char* userId; - const char* username; - const char* discriminator; - const char* avatar; -} DiscordUser; - -typedef struct DiscordEventHandlers { - void (*ready)(const DiscordUser* request); - void (*disconnected)(int errorCode, const char* message); - void (*errored)(int errorCode, const char* message); - void (*joinGame)(const char* joinSecret); - void (*spectateGame)(const char* spectateSecret); - void (*joinRequest)(const DiscordUser* request); -} DiscordEventHandlers; - -#define DISCORD_REPLY_NO 0 -#define DISCORD_REPLY_YES 1 -#define DISCORD_REPLY_IGNORE 2 -#define DISCORD_PARTY_PRIVATE 0 -#define DISCORD_PARTY_PUBLIC 1 - -DISCORD_EXPORT void Discord_Initialize(const char* applicationId, - DiscordEventHandlers* handlers, - int autoRegister, - const char* optionalSteamId); -DISCORD_EXPORT void Discord_Shutdown(void); - -/* checks for incoming messages, dispatches callbacks */ -DISCORD_EXPORT void Discord_RunCallbacks(void); - -/* If you disable the lib starting its own io thread, you'll need to call this from your own */ -#ifdef DISCORD_DISABLE_IO_THREAD -DISCORD_EXPORT void Discord_UpdateConnection(void); -#endif - -DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence); -DISCORD_EXPORT void Discord_ClearPresence(void); - -DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply); - -DISCORD_EXPORT void Discord_UpdateHandlers(DiscordEventHandlers* handlers); - -#ifdef __cplusplus -} /* extern "C" */ -#endif