Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config, Texture and Map updates #111

Merged
merged 47 commits into from Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
e2e5902
Merge pull request #96 from MissLavender-LQ/main
MissLavender-LQ Feb 4, 2024
0a2bda7
iron wail map menu support
MissLavender-LQ Feb 5, 2024
7130312
Update accessibility.md
MissLavender-LQ Feb 7, 2024
2dd83e5
Update .gitignore
MissLavender-LQ Feb 7, 2024
92f45a1
Revert "Update .gitignore"
MissLavender-LQ Feb 8, 2024
3ee6962
Merge pull request #99 from MissLavender-LQ/main
MissLavender-LQ Feb 8, 2024
b66fa3e
Merge pull request #101 from MissLavender-LQ/main
MissLavender-LQ Feb 11, 2024
be9b5d5
Merge pull request #106 from MissLavender-LQ/main
MissLavender-LQ Feb 19, 2024
eabdc33
Merge pull request #108 from MissLavender-LQ/main
MissLavender-LQ Feb 19, 2024
747a273
Revert "Update default.cfg"
MissLavender-LQ Feb 19, 2024
428698b
Merge branch 'misslav' of https://github.com/MissLavender-LQ/LibreQua…
MissLavender-LQ Feb 19, 2024
3d26954
adding this for joequake support
MissLavender-LQ Feb 19, 2024
c37710c
added -config.cfg and flame0.mdl
MissLavender-LQ Feb 19, 2024
b82482b
Create -config.cfg
MissLavender-LQ Feb 19, 2024
4e8a8e6
alot of engine specific commands added
MissLavender-LQ Feb 19, 2024
22894fc
Update .gitignore
MissLavender-LQ Feb 19, 2024
c6e423c
Update dev.cfg
MissLavender-LQ Feb 19, 2024
fc1ab57
new logo
MissLavender-LQ Feb 20, 2024
537467b
updated with strings to disable some of the dp features by default
MissLavender-LQ Feb 20, 2024
597a45c
Update default.cfg
MissLavender-LQ Feb 20, 2024
9ba9383
Update default.cfg
MissLavender-LQ Feb 22, 2024
9562fb3
added files for markv
MissLavender-LQ Feb 22, 2024
1f83e68
tech logo updated
MissLavender-LQ Feb 22, 2024
a4a791f
fixed padding for fte
MissLavender-LQ Feb 22, 2024
587eab1
Update default.cfg
MissLavender-LQ Feb 29, 2024
c93f639
new wad lq_palette.wad
MissLavender-LQ Mar 4, 2024
1bc4e87
cropped dev floor and wall textures
MissLavender-LQ Mar 4, 2024
b5de0a2
new lq_dev "dot" textures
MissLavender-LQ Mar 4, 2024
22e82c6
updated dev.raw.xcf with new dev textures
MissLavender-LQ Mar 4, 2024
349e0ef
lq_palette.wad added to script
MissLavender-LQ Mar 4, 2024
c4a4a48
crate texture file that i may work on more later
MissLavender-LQ Mar 4, 2024
f5c020a
added librebit font to the repo
MissLavender-LQ Mar 4, 2024
cb3c2df
added *-compile.map to prevent tb temp files from being pushed
MissLavender-LQ Mar 4, 2024
873046c
updated all transition maps (not including e0)
MissLavender-LQ Mar 5, 2024
ca6cd39
removed teleskip and h20tele skip since they dont work
MissLavender-LQ Mar 5, 2024
c0c30a7
dev map updated
MissLavender-LQ Mar 5, 2024
2901951
temp start map update
MissLavender-LQ Mar 5, 2024
7a5a128
removed 1280x800 res command
MissLavender-LQ Mar 6, 2024
a168fc9
Merge pull request #112 from MissLavender-LQ/main
MissLavender-LQ Mar 6, 2024
17e824d
maps that need lq_palette.wad have it now
MissLavender-LQ Mar 6, 2024
93de635
update to waterskip and fixed the name
MissLavender-LQ Mar 6, 2024
b148633
update to waterskip
MissLavender-LQ Mar 6, 2024
0807c64
update to waterskip and removed teleskip
MissLavender-LQ Mar 6, 2024
47dba06
slight update to all lava and slime skips
MissLavender-LQ Mar 6, 2024
c487d50
fixed texture offset on crate map
MissLavender-LQ Mar 6, 2024
85be430
fixed the lack of full bright on this texture
MissLavender-LQ Mar 7, 2024
48c5d6d
misc maps now have lq_palette.wad
MissLavender-LQ Mar 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -38,12 +38,14 @@ lq-pl.xcf
*.cfg
*.kate-swp
*autosave.kra
*-compile.map

# included files
!lq1/default.cfg
!lq1/dev.cfg
!lq1/zoom90.cfg
!lq1/zoom120.cfg
!lq1/-config.cfg



Expand Down
14 changes: 11 additions & 3 deletions build_components.json
Expand Up @@ -22,13 +22,14 @@
"base_dir": "lq1",
"source_if_missing": "",
"files_pak0": [
"progs.dat",
"gfx.wad",
"demo1.dem",
"demo2.dem",
"demo3.dem"
],
"files_pak1": [],
"files_pak1": [
"progs.dat"
],
"files_unpacked": []
},
"config": {
Expand All @@ -40,6 +41,7 @@
],
"files_pak1": [],
"files_unpacked": [
["-config.cfg", "config.cfg"],
"cam.cfg",
"dev.cfg",
"zoom90.cfg",
Expand Down Expand Up @@ -309,6 +311,7 @@
"progs/dog.mdl",
"progs/end1.mdl",
"progs/eyes.mdl",
"progs/flame0.mdl",
"progs/flame.mdl",
"progs/flame2.mdl",
"progs/g_light.mdl",
Expand Down Expand Up @@ -664,7 +667,6 @@
"gfx/box_tr.lmp",
"gfx/colormap.lmp",
"gfx/complete.lmp",
"gfx/conback.lmp",
"gfx/dim_drct.lmp",
"gfx/dim_ipx.lmp",
"gfx/dim_modm.lmp",
Expand Down Expand Up @@ -710,6 +712,12 @@
"gfx/menumods.lmp"
],
"files_pak1": [
"gfx/sp_maps.lmp",
"gfx/mainmenu.lmp",
"gfx/conback.lmp",
"gfx/menumods.lmp",
"gfx/levels.lmp",
"gfx/demos.lmp",
"gfx/pop.lmp"
],
"files_unpacked": []
Expand Down
Binary file added docs/lqlogos/logo-tech.ora
Binary file not shown.
Binary file added docs/lqlogos/logo-tech.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lq1/accessibility.md
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_flatlightstyles 2 (to disable flashing lights)
r_dynamic 0 (to disable flashing lights)
45 changes: 38 additions & 7 deletions lq1/default.cfg
Expand Up @@ -9,6 +9,7 @@ bind "SPACE" "+jump"
bind "ALT" "+strafe"
bind "SHIFT" "+speed"
bind "e" "+moveup"
bind "c" "+movedown"
bind "CTRL" "+movedown"

//Weapon Keys
Expand Down Expand Up @@ -58,13 +59,42 @@ bind "-" "sizedown"
+speed

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

gl_texturemode gl_nearest_mipmap_linear
gl_texturemode_sky gl_nearest
gl_texturemode_hud gl_nearest
gl_texturemode2d gl_nearest
gl_overbright 1
gl_overbright_model 1
gl_smoothfont 0
gl_texture_anisotropy 2
vid_fsaamode 1
vid_fsaa 2
vid_conautoscale 3
scr_pixelaspect 1
scr_crosshairscale 3
scr_menuscale 3
scr_conscale 3
scr_sbarscale 3
cl_stainmaps 0
cl_decals 0
cl_alwaysrun 0
cl_particles_quake 1
cl_beams_polygons 0
r_font_linear 0
r_font_postprocess_mono 1
MotoLegacy marked this conversation as resolved.
Show resolved Hide resolved
r_menutint 0.99 0.46 0.34
r_waterscroll 10
r_waterwarp 0.2
r_particles 2
r_stains 0
registered 1
volume 0.7
gamma 1
contrast 1
sensitivity 3
topcolor 11
bottomcolor 10
crosshair 0

//Configs
alias "cam" "exec cam.cfg"
Expand All @@ -81,3 +111,4 @@ alias +lq-zoom90 "fov 90;wait;fov 80;wait;fov 70;wait;fov 60;wait;fov 50;wait;fo
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"
vid_restart
6 changes: 3 additions & 3 deletions lq1/dev.cfg
Expand Up @@ -7,7 +7,6 @@ alias "quad" "impulse 255"
// 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 @@ -22,8 +21,6 @@ echo v = noclip
echo " "
echo n = notarget
echo " "
bind # = developer mode
echo " "
echo f = fullbright
echo " "
echo h = hitboxes
Expand All @@ -39,3 +36,6 @@ echo " "
echo l = quad
echo " "
echo k = kill

echo [NOTICE] If u used the "c" for swim down "freeze" has now overwriten it.
echo if u were using default LibreQuake keybinds "ctrl" key is also bound to swim down
MotoLegacy marked this conversation as resolved.
Show resolved Hide resolved
Binary file added lq1/gfx-wad/src/librebit.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lq1/gfx/demos.lmp
Binary file not shown.
Binary file added lq1/gfx/demos.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lq1/gfx/levels.lmp
Binary file not shown.
Binary file added lq1/gfx/levels.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed lq1/gfx/menumaps.lmp
Binary file not shown.
Binary file modified lq1/gfx/mp_menu.lmp
Binary file not shown.
Binary file modified lq1/gfx/mp_menu.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 2 additions & 5 deletions lq1/maps/src/e0/e0m1.map
Expand Up @@ -5,7 +5,7 @@
"mapversion" "220"
"classname" "worldspawn"
"_tb_mod" "lq1"
"wad" "../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_tech.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_props.wad;../../../../texture-wads/lq_metal.wad;../../../../texture-wads/lq_terra.wad"
"wad" "../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_tech.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_props.wad;../../../../texture-wads/lq_metal.wad;../../../../texture-wads/lq_terra.wad;../../../../texture-wads/lq_palette.wad"
"_bounce" "1"
"_dirt" "1"
"_sunlight" "300"
Expand Down Expand Up @@ -6067,6 +6067,7 @@
"_tb_type" "_tb_group"
"_tb_name" "light_red_flicker"
"_tb_id" "9"
"_tb_linked_group_id" "{c1659cee-1639-4a13-86e7-26e6a4a5483f}"
}
// entity 10
{
Expand Down Expand Up @@ -6757,7 +6758,6 @@
"_tb_name" "door_gold_light"
"_tb_id" "23"
"_tb_linked_group_id" "{38ec0cb0-f886-4064-bde4-127c9b0db41e}"
"_tb_transformation" "1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1"
// brush 0
{
( -976 -192 128 ) ( -976 -208 128 ) ( -976 -208 0 ) t_wall2a [ 0 -1 0 0 ] [ -0 -0 -1 0 ] 0 1 1
Expand Down Expand Up @@ -7275,7 +7275,6 @@
"_tb_name" "crate"
"_tb_id" "37"
"_tb_linked_group_id" "{66415bb8-5a69-49d8-a868-fbc469adc6c0}"
"_tb_transformation" "1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1"
}
// entity 100
{
Expand Down Expand Up @@ -7482,7 +7481,6 @@
"_tb_name" "crate_small"
"_tb_id" "46"
"_tb_linked_group_id" "{eee8bcec-1a0a-4a19-a0cf-795b5ad05aa8}"
"_tb_transformation" "1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1"
}
// entity 118
{
Expand Down Expand Up @@ -8019,7 +8017,6 @@
"_tb_name" "detail_pillar"
"_tb_id" "55"
"_tb_linked_group_id" "{41568952-7b0e-4e05-8d39-1be399b50f63}"
"_tb_transformation" "1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1"
// brush 0
{
( -128 -256 296 ) ( -128 -192 176 ) ( -128 -192 296 ) t_trim2ba [ 0 4.371139006309477e-08 -0.999999999999999 0 ] [ 0 0.999999999999999 4.371139006309477e-08 0 ] 90 1 1
Expand Down
2 changes: 1 addition & 1 deletion lq1/maps/src/e0/e0m2.map
Expand Up @@ -4,7 +4,7 @@
{
"classname" "worldspawn"
"mapversion" "220"
"wad" "../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_medieval.wad;../../../../texture-wads/lq_mayan.wad;../../../../texture-wads/lq_terra.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_wood.wad;../../../../texture-wads/lq_metal.wad;../../../../texture-wads/lq_tech.wad"
"wad" "../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_medieval.wad;../../../../texture-wads/lq_mayan.wad;../../../../texture-wads/lq_terra.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_wood.wad;../../../../texture-wads/lq_metal.wad;../../../../texture-wads/lq_tech.wad;../../../../texture-wads/lq_palette.wad"
"_bounce" "1"
"_bouncecolorscale" "1"
"_dirty" "1"
Expand Down
4 changes: 3 additions & 1 deletion lq1/maps/src/e0/e0m3.map
Expand Up @@ -5,7 +5,7 @@
"mapversion" "220"
"classname" "worldspawn"
"_tb_mod" "lq1"
"wad" "../../../../texture-wads/lq_medieval.wad;../../../../texture-wads/lq_terra.wad;../../../../texture-wads/lq_wood.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_mayan.wad;../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_health_ammo.wad;../../../../texture-wads/lq_props.wad"
"wad" "../../../../texture-wads/lq_medieval.wad;../../../../texture-wads/lq_terra.wad;../../../../texture-wads/lq_wood.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_mayan.wad;../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_health_ammo.wad;../../../../texture-wads/lq_props.wad;../../../../texture-wads/lq_palette.wad"
"_bounce" "3"
"_phong" "1"
"fog" "0.03 .5 .5 .7"
Expand Down Expand Up @@ -6591,6 +6591,7 @@
"_tb_type" "_tb_group"
"_tb_name" "well"
"_tb_id" "5"
"_tb_linked_group_id" "{5d2a08be-a63a-427e-b9c2-ed8e37cf07f4}"
// brush 0
{
( 2152 -768 -456 ) ( 2112 -808 -496 ) ( 2152 -768 -496 ) med_dbrick6b [ -0.7071067811865476 -0.7071067811865476 0 -2.6643677 ] [ 0 0 -1 0 ] 0 1 1
Expand Down Expand Up @@ -7662,6 +7663,7 @@
"_tb_type" "_tb_group"
"_tb_name" "house2"
"_tb_id" "13"
"_tb_linked_group_id" "{aacec277-33b2-4694-b539-e2570636a4fc}"
// brush 0
{
( 2032 -1120 -504 ) ( 2032 -1120 -392 ) ( 2048 -1136 -392 ) med_csl_brk8_1c [ -9.494107596574928e-16 -1 0 -96 ] [ 0 0 -1 8 ] 180 1 1
Expand Down
3 changes: 1 addition & 2 deletions lq1/maps/src/e0/e0m4.map
Expand Up @@ -4,7 +4,7 @@
{
"mapversion" "220"
"classname" "worldspawn"
"wad" "../../../../texture-wads/lq_medieval.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_wood.wad;../../../../texture-wads/lq_dev.wad"
"wad" "../../../../texture-wads/lq_medieval.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_wood.wad;../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_palette.wad"
"_bounce" "3"
"_dirt" "1"
"message" "Feint-free funtime"
Expand Down Expand Up @@ -6237,7 +6237,6 @@
"_tb_name" "spikeshooter"
"_tb_id" "2"
"_tb_linked_group_id" "{99d0cb55-ecdf-4ebb-86b0-550fa93700bc}"
"_tb_transformation" "1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1"
}
// entity 60
{
Expand Down
6 changes: 3 additions & 3 deletions lq1/maps/src/e0/e0m5.map
Expand Up @@ -8,7 +8,7 @@
"message" "Adequate Aquatic Adventure"
"_bounce" "3"
"_dirt" "1"
"wad" "../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_mayan.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_wood.wad;../../../../texture-wads/lq_terra.wad;../../../../texture-wads/lq_legacy.wad;../../../../texture-wads/lq_medieval.wad"
"wad" "../../../../texture-wads/lq_dev.wad;../../../../texture-wads/lq_mayan.wad;../../../../texture-wads/lq_liquidsky.wad;../../../../texture-wads/lq_wood.wad;../../../../texture-wads/lq_terra.wad;../../../../texture-wads/lq_legacy.wad;../../../../texture-wads/lq_medieval.wad;../../../../texture-wads/lq_palette.wad"
"_splitturb" "1"
"wateralpha" "0.7"
"fog" "0.02 0.8 0.8 1"
Expand Down Expand Up @@ -9032,7 +9032,6 @@
"_tb_name" "door1"
"_tb_id" "3"
"_tb_linked_group_id" "{8c7ed2c1-dc2c-4ca3-a5f6-963435f4a6d3}"
"_tb_transformation" "1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1"
}
// entity 92
{
Expand Down Expand Up @@ -10676,7 +10675,6 @@
"_tb_name" "support1"
"_tb_id" "11"
"_tb_linked_group_id" "{c7fd8e07-c1ea-4d63-9f01-290776ff3c61}"
"_tb_transformation" "1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1"
// brush 0
{
( 832 -160 544 ) ( 832 -224 544 ) ( 832 -224 400 ) may_brk1_1 [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
Expand Down Expand Up @@ -10880,6 +10878,7 @@
"_tb_type" "_tb_group"
"_tb_name" "support2"
"_tb_id" "15"
"_tb_linked_group_id" "{b01203a0-7960-4194-adb3-7b9ce64a0e8c}"
// brush 0
{
( 1440 160 544 ) ( 1504 224 400 ) ( 1440 224 544 ) may_bnd1_2 [ 0 -4.371139006309477e-08 -0.999999999999999 0 ] [ 0 -0.999999999999999 4.371139006309477e-08 63.999992 ] 222.07503 1 1
Expand All @@ -10904,6 +10903,7 @@
"_tb_type" "_tb_group"
"_tb_name" "support2"
"_tb_id" "16"
"_tb_linked_group_id" "{f3e3e484-192f-47a2-a3da-fa6222247af8}"
// brush 0
{
( 1440 -224 544 ) ( 1504 -160 400 ) ( 1440 -160 544 ) may_bnd1_2 [ 0 -4.371139006309477e-08 -0.999999999999999 0 ] [ 0 -0.999999999999999 4.371139006309477e-08 63.999992 ] 222.07503 1 1
Expand Down