Skip to content

Commit

Permalink
touch ups for alpha test build
Browse files Browse the repository at this point in the history
  • Loading branch information
BanceDev committed Jun 18, 2024
1 parent 43b899a commit 1a4bbdd
Show file tree
Hide file tree
Showing 383 changed files with 2,375 additions and 462 deletions.
544 changes: 283 additions & 261 deletions imgui.ini

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ int main(int, char **) {
// Set font to the Ubuntu font
QuakePrism::loadFonts();
// Our state
bool show_demo_window = true;
ImVec4 clear_color = ImVec4(0.0f, 0.0f, 0.0f, 1.00f);

// create the framebuffer right before the main loop
Expand Down Expand Up @@ -187,11 +186,6 @@ int main(int, char **) {
ImGui::PushFont(QuakePrism::ubuntuFont);
QuakePrism::DrawMenuBar();
ImGui::DockSpaceOverViewport();
// 1. Show the big demo window (Most of the sample code is in
// ImGui::ShowDemoWindow()! You can browse its code to learn more
// about Dear ImGui!).
if (show_demo_window)
ImGui::ShowDemoWindow(&show_demo_window);

QuakePrism::DrawModelViewer(texture_id, RBO, FBO);
QuakePrism::DrawTextureViewer();
Expand Down
2 changes: 1 addition & 1 deletion src/res/templates/LibreQuake/accessibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ gl_zfix 1 (to prevent texture flickering aka "z fighting")

r_waterwarp 0 (to disabled the water shader effect)

r_dynamic 0 (to disable flashing lights)
r_flatlightstyles 2 (to disable flashing lights)
17 changes: 17 additions & 0 deletions src/res/templates/LibreQuake/cam.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
bind home "impulse 200"
bind pgup "impulse 201"
bind pgdn "impulse 202"
bind end "impulse 203"

echo ""
echo ""
echo ""
echo "home - Spawns a cutscene camera. Maximum of three can be at play."
echo ""
echo "pageup - Increments the automatic-switching delay by five seconds."
echo ""
echo "pagedown - Decrements the automatic-switching delay by five seconds."
echo ""
echo "end - Begins 'playback' of demo cameras."

developer 1
225 changes: 81 additions & 144 deletions src/res/templates/LibreQuake/default.cfg
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,146 +1,83 @@
//========LQ Default Config========\\
unbindall
bind "TAB" "+showscores"
bind "ENTER" "messagemode"
bind "ESCAPE" "togglemenu"
bind "SPACE" "+jump"
bind "+" "sizeup"
bind "-" "sizedown"
bind "/" "impulse 10"
bind "0" "impulse 0"
bind "1" "impulse 1"
bind "2" "impulse 2"
bind "3" "impulse 3"
bind "4" "impulse 4"
bind "5" "impulse 5"
bind "6" "impulse 6"
bind "7" "impulse 7"
bind "8" "impulse 8"
bind "=" "sizeup"
bind "`" "toggleconsole"
bind "a" "+moveleft"
bind "c" "+movedown"
bind "d" "+moveright"
bind "e" "+moveup"
bind "q" "impulse 10"
bind "s" "+back"
bind "t" "messagemode"
bind "w" "+forward"
bind "ALT" "+strafe"
bind "CTRL" "+movedown"
bind "SHIFT" "+speed"
bind "F1" "help"
bind "F2" "menu_save"
bind "F3" "menu_load"
bind "F4" "menu_options"
bind "F5" "menu_multiplayer"
bind "F6" "echo Saving; wait; save lq_quick"
bind "F9" "echo Loading; wait; load lq_quick"
bind "F10" "echo f10 is unbound"
bind "F12" "screenshot"
bind "MOUSE1" "+attack"
bind "MWHEELUP" "impulse 10"
bind "MWHEELDOWN" "impulse 12"
bind "PAUSE" "pause"
_snd_mixahead "0.1"
bgm_extmusic "1"
bgmvolume "1"
bottomcolor "10"
cfg_unbindall "1"
cl_alwaysrun "0"
cl_backspeed "200"
cl_demoreel "0"
cl_forwardspeed "200"
cl_gun_fovscale "1"
cl_maxpitch "90"
cl_minpitch "-90"
cl_nopred "0"
cl_voip_autogain "0"
cl_voip_bitrate "3000"
cl_voip_capturingvol "0.5"
cl_voip_codec ""
cl_voip_ducking "0.5"
cl_voip_micamp "2"
cl_voip_noisefilter "1"
cl_voip_play "1"
cl_voip_showmeter "1"
contrast "1"
crosshair "0"
external_ents "1"
external_vis "1"
fov_adapt "1"
gamma "1"
gl_farclip "16384"
gl_flashblend "0"
gl_fullbrights "1"
gl_load24bit "1"
gl_overbright "1"
gl_overbright_models "1"
gl_subdivide_size "128"
gl_texture_anisotropy "2"
gl_texturemode "GL_NEAREST_MIPMAP_LINEAR"
gl_triplebuffer "1"
host_maxfps "72"
joy_deadzone_look "0.175"
joy_deadzone_move "0.175"
joy_deadzone_trigger "0.2"
joy_enable "1"
joy_exponent "2"
joy_exponent_move "2"
joy_invert "0"
joy_outer_threshold_look "0.02"
joy_outer_threshold_move "0.02"
joy_sensitivity_pitch "130"
joy_sensitivity_yaw "240"
joy_swapmovelook "0"
lookspring "0"
lookstrafe "0"
m_forward "1"
m_pitch "0.022"
m_side "0.8"
m_yaw "0.022"
name "player"
r_brokenturbbias "1"
r_clearcolor "2"
r_dynamic "1"
r_lerpmodels "1"
r_lerpmove "1"
r_novis "0"
r_particles "2"
r_quadparticles "1"
r_replacemodels ""
r_scale "1"
r_shadows "0"
r_viewmodel_quake "0"
r_wateralpha "1"
saved1 "0"
saved2 "0"
saved3 "0"
saved4 "0"
savedgamecfg "0"
scr_conalpha "0.5"
scr_conscale "3"
scr_conspeed "500"
scr_conwidth "0"
scr_crosshairscale "3"
scr_menuscale "3"
scr_sbaralpha "0.95"
scr_sbarscale "3"
sensitivity "3"
snd_mixspeed "44100"
sv_altnoclip "1"
sv_nqplayerphysics "1"
sys_throttle "0.02"
topcolor "11"
vid_borderless "0"
vid_bpp "24"
vid_desktopfullscreen "0"
vid_fsaa "2"
vid_fullscreen "0"
vid_height "600"
vid_refreshrate "75"
vid_vsync "0"
vid_width "800"
viewsize "110"
volume "0.7"
vid_restart
//Movement Keys
bind "w" "+forward"
bind "a" "+moveleft"
bind "s" "+back"
bind "d" "+moveright"
bind "SPACE" "+jump"
bind "ALT" "+strafe"
bind "SHIFT" "+speed"
bind "e" "+moveup"
bind "CTRL" "+movedown"

//Weapon Keys
bind "MOUSE1" "+attack"
bind "1" "impulse 1"
bind "2" "impulse 2"
bind "3" "impulse 3"
bind "4" "impulse 4"
bind "5" "impulse 5"
bind "6" "impulse 6"
bind "7" "impulse 7"
bind "8" "impulse 8"
bind "0" "impulse 0"

//Alternate Weapons
bind "/" "impulse 10"
bind "q" "impulse 10"
bind "MWHEELUP" "impulse 10"
bind "MWHEELDOWN" "impulse 12"

//Menus
bind "f1" "help"
//bind "f1" "toggle r_drawviewmodel"
bind "f2" "menu_save"
bind "f3" "menu_load"
bind "f4" "menu_options"
bind "f5" "menu_multiplayer"
//bind "f5" "toggle chase_active"
bind "f6" "echo Saving; wait; save lq_quick"
bind "f9" "echo Loading; wait; load lq_quick"
bind "f10" "echo f10 is unbound"
bind "f12" "screenshot"
bind "PRINTSCREEN" "screenshot"
bind "PAUSE" "pause"
bind "ESCAPE" "togglemenu"
bind "`" "toggleconsole"
bind "t" "messagemode"
bind "enter" "messagemode"
bind "TAB" "+showscores"


//Misc
bind "+" "sizeup"
bind "=" "sizeup"
bind "-" "sizedown"
+mlook
+speed

//Cvars
gl_texturemode "GL_NEAREST_MIPMAP_LINEAR"
gl_texture_anisotropy "8"
registered "1""
vid_fsaamode "1"
vid_fsaa "4"
volume "0.7""


//Configs
alias "cam" "exec cam.cfg"
alias "dev" "exec dev.cfg"
alias "zoom90" "exec zoom90.cfg"
alias "zoom120" "exec zoom120.cfg"

//Alias
alias "freeze" "toggle sv_freezenonclients;echo toggled_freeze"
alias "idkfa" "impulse 9"
alias "fullammo" "impulse 9"
alias "quad" "impulse 255"
alias +lq-zoom90 "fov 90;wait;fov 80;wait;fov 70;wait;fov 60;wait;fov 50;wait;fov 40"
alias -lq-zoom90 "fov 50;wait;fov 60;wait;fov 70;wait;fov 80;wait;fov 90"
alias +lq-zoom120 "fov 110;wait;fov 100;wait;fov 90;wait;fov 80;wait;fov 70;wait;fov 60;wait;fov 50;wait;fov 40"
alias -lq-zoom120 "fov 50;wait;fov 60;wait;fov 70;wait;fov 80;wait;fov 90;wait;fov 100;wait;fov 110;wait;fov 120"
Binary file removed src/res/templates/LibreQuake/demo1_lite.dem
Binary file not shown.
Binary file removed src/res/templates/LibreQuake/demo2_lite.dem
Binary file not shown.
Binary file removed src/res/templates/LibreQuake/demo3_lite.dem
Binary file not shown.
47 changes: 4 additions & 43 deletions src/res/templates/LibreQuake/dev.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,10 @@ alias "freeze" "toggle sv_freezenonclients;echo toggled_freeze"
alias "fullammo" "impulse 9"
alias "quad" "impulse 255"

//Host_Timescale Aliases
alias ht10 "host_timescale 10;echo 10x speed [Max];bind ] ht10;bind [ ht9""
alias ht9 "host_timescale 9;echo 9x speed;bind ] ht10;bind [ ht8""
alias ht8 "host_timescale 8;echo 8x speed;bind ] ht9;bind [ ht7""
alias ht7 "host_timescale 7;echo 7x speed;bind ] ht8;bind [ ht6""
alias ht6 "host_timescale 6;echo 6x speed;bind ] ht7;bind [ ht5""
alias ht5 "host_timescale 5;echo 5x speed;bind ] ht6;bind [ ht4""
alias ht4 "host_timescale 4;echo 4x speed;bind ] ht5;bind [ ht3""
alias ht3 "host_timescale 3;echo 3x speed;bind ] ht4;bind [ ht2""
alias ht2 "host_timescale 2;echo 2x speed;bind ] ht3;bind [ ht1""
alias ht1 "host_timescale 1;echo 1x Speed [Default];bind ] ht2;bind [ ht09"
alias ht09 "host_timescale 0.9;echo 0.9 speed;bind ] ht1;bind [ ht08""
alias ht08 "host_timescale 0.8;echo 0.8 speed;bind ] ht09;bind [ ht07""
alias ht07 "host_timescale 0.7;echo 0.7 speed;bind ] ht08;bind [ ht06""
alias ht06 "host_timescale 0.6;echo 0.6 speed;bind ] ht07;bind [ ht05""
alias ht05 "host_timescale 0.5;echo 0.5 speed;bind ] ht06;bind [ ht04""
alias ht04 "host_timescale 0.4;echo 0.4 speed;bind ] ht05;bind [ ht03""
alias ht03 "host_timescale 0.3;echo 0.3 speed;bind ] ht04;bind [ ht02""
alias ht02 "host_timescale 0.2;echo 0.2 speed;bind ] ht03;bind [ ht01""
alias ht01 "host_timescale 0.1;echo 0.1 speed [Min];bind ] ht02;bind [ ht01""
bind ] ht1 // speed up
bind [ ht1 // speed down
bind ' ht1 //reset
echo ] = game speed up
echo " "
echo [ = game speed down
echo " "
echo ' = game speed reset
// binds
bind v noclip
bind n notarget
bind # "toggle developer"
bind f "toggle r_fullbright"
bind h "toggle r_showbboxes"
bind b "toggle r_showtris"
Expand All @@ -46,14 +16,14 @@ bind g god
bind p "impulse 9"
bind l "impulse 255"
bind k kill
bind ' ht1 //reset
bind ] ht1 // speed up
bind [ ht1 // speed down

clear
echo v = noclip
echo " "
echo n = notarget
echo " "
bind # = developer mode
echo " "
echo f = fullbright
echo " "
echo h = hitboxes
Expand All @@ -69,12 +39,3 @@ echo " "
echo l = quad
echo " "
echo k = kill
echo " "
echo ] = game speed up
echo " "
echo [ = game speed down
echo " "
echo ' = game speed reset
echo " "
echo [NOTICE] If u used the "c" for swim down "bind c freeze" has now overwriten it.
echo if u were using default LibreQuake keybinds "ctrl" key is also bound to swim down
33 changes: 33 additions & 0 deletions src/res/templates/LibreQuake/docs/COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
Copyright © 2019-2023
Contributors to the LibreQuake project. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the LibreQuake project nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS
IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

For a list of contributors to the LibreQuake project, see the file
CREDITS.

For a list of resources used in the LibreQuake project, see the directory
docs
Loading

0 comments on commit 1a4bbdd

Please sign in to comment.