Commit 47c3570d authored by D-AIRY's avatar D-AIRY

NPC movement; NPC logick; Ent delete bug; Timers bug; Command line parser;...

NPC movement; NPC logick; Ent delete bug; Timers bug; Command line parser; Game UI; Game HUD; Game settings
parent 8d843ac3

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -197,6 +197,8 @@ source/s4g/tests/
*.old
*.orig
*.sxf
build/*
!gamesource/
build/gamesource/*
......
......@@ -2,4 +2,8 @@ echo "Executing editor config file"
cl_mode_editor 1
r_stats 1
\ No newline at end of file
r_stats 1
hud_draw 0
hud_crosshair 0
hud_rangefinder 0
......@@ -28,4 +28,6 @@ r_pssm_shadowed 1
r_shadow_soft 1
pssm_4or3 0
exec ../config_game_user_auto.cfg
spawn
\ No newline at end of file
echo "Executing sys config file"
bind escape exit
bind escape game_menu
bind f12 screenshot
bind f11 save_worktex
......@@ -39,4 +39,6 @@ main_thunderbolt true
g_time_speed 1
cl_grab_cursor 0
......@@ -3,3 +3,27 @@
model = "models/zombie/zombie.dse"
; model = "models/zombie/zombie_hb.dse"
; model = "models/stalker_zombi/stalker_zombi_a.dse"
[wpn_zombie_hands]
; model = ""
reload_time = 0
max_distance = 2.0
inv_weight = 1
ammos = ""
zoomable = 0
fire_modes = "single"
single_rate = 40; выст/мин
effective_distance = 2
;разброс
spread_base = 10 ;угол (в градусах) базовой дисперсии оружия (оружия, зажатого в тисках)
; звуки
snd_shoot = "mobs/zombie/zombie_attack_1.ogg" ; Стрелять
damage = 100
html
{
background-color: #000;
}
#background
{
position: fixed;
......@@ -8,529 +13,55 @@
background-image: /img/loading.jpg;
background-position-x: 50%;
background-size-y: 100%;
}
#top_line
{
position: absolute;
top: 0;
left: 0;
right: 0;
height: 50px;
background-color: #FFFFFF33;
}
body
{
color: #FFFFFF;
font-name: cour;
}
#logo
{
font-size: 40px;
padding-top: 8px;
padding-left: 20px;
display: inline-block;
}
.top_button
{
display: inline-block;
font-size: 20px;
padding: 14px 10px 0;
border-right-width: 2px;
border-left-width: 2px;
border-right-color: #00000033;
border-left-color: #00000033;
text-align: center;
height: 100%;
cursor: pointer;
}
.top_button:hover
{
background-color: #FFFFFF33;
}
.top_button:active
{
background-color: #00FF0033;
}
.top_right
{
position: absolute;
top: 0;
right: 0;
height: 100%;
width: 350px;
text-align: right;
}
#main_wrapper
{
position: absolute;
top: 55px;
left: 10%;
right: 10%;
bottom: 5px;
}
#match_wrapper
{
background-color: #FFFFFF33;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 295px;
}
#chatbox_wrapper
{
background-color: #FFFFFF33;
position: absolute;
height: 250px;
left: 0;
right: 0;
bottom: 43px;
}
#userinfo_wrapper
{
background-color: #FFFFFF33;
position: absolute;
height: 40px;
left: 0;
right: 0;
bottom: 0;
}
#chat_friends
{
position: absolute;
top: 0;
left: 0;
width: 300px;
bottom: 0;
border-right-width: 3px;
border-right-color: #00000066;
}
#chat_f_header
{
text-align: center;
font-size: 20px;
border-bottom-color: #00000066;
border-bottom-width: 3px;
padding: 5px;
}
#chat_f_list
{
height: 215px;
}
.friend
{
padding: 3px 5px;
border-bottom-color: #00000066;
border-bottom-width: 1px;
}
.friend:hover
{
background-color: #FFFFFF33;
}
.friend:active
{
background-color: #00FF0033;
-gui-z: 0;
opacity: 1;
transition-property: -gui-z;
transition-duration: 0.4s;
}
#chat_block
body:disabled #background
{
position: absolute;
top: 0;
left: 300px;
right: 0;
bottom: 0;
-gui-z: -200px;
opacity: 0.4;
}
.tabs_header
#left_menu
{
//background-color: #00FF0088;
top: 40%;
left: 10%;
height: 60%;
width: 30%;
position: absolute;
top: 0;
height: 30px;
right: 0;
left: 0;
border-bottom-color: #00000066;
border-bottom-width: 3px;
}
.tabs_content
{
position: absolute;
top: 30px;
right: 0;
left: 0;
bottom: 0;
}
.tabs_content > div
{
position: absolute;