Compare commits
No commits in common. "c618c0e1c1b2926f12d31113d44a40d32382f87c" and "b5ab4220179d49f7ac85f7903f09fefdbc56797f" have entirely different histories.
c618c0e1c1
...
b5ab422017
|
@ -775,9 +775,6 @@ pub fn handle_chat_events(
|
||||||
chat.talker.name.clone().unwrap_or("".to_string()),
|
chat.talker.name.clone().unwrap_or("".to_string()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
hud::LogLevel::Send => {
|
|
||||||
log.send(message.into());
|
|
||||||
}
|
|
||||||
hud::LogLevel::Info => {
|
hud::LogLevel::Info => {
|
||||||
log.info(message.into());
|
log.info(message.into());
|
||||||
}
|
}
|
||||||
|
@ -854,7 +851,6 @@ pub fn handle_chat_events(
|
||||||
fn handle_reply_keys(
|
fn handle_reply_keys(
|
||||||
keyboard_input: Res<ButtonInput<KeyCode>>,
|
keyboard_input: Res<ButtonInput<KeyCode>>,
|
||||||
settings: Res<var::Settings>,
|
settings: Res<var::Settings>,
|
||||||
mut log: ResMut<hud::Log>,
|
|
||||||
q_choices: Query<&Choice>,
|
q_choices: Query<&Choice>,
|
||||||
mut q_chats: Query<&mut Chat>,
|
mut q_chats: Query<&mut Chat>,
|
||||||
mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
|
mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
|
||||||
|
@ -875,9 +871,6 @@ fn handle_reply_keys(
|
||||||
if let Ok(mut chat) = q_chats.get_single_mut() {
|
if let Ok(mut chat) = q_chats.get_single_mut() {
|
||||||
// Advance the chat.
|
// Advance the chat.
|
||||||
ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click));
|
ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Click));
|
||||||
if choice.text != TEXT_CONTINUE {
|
|
||||||
log.send(choice.text.clone());
|
|
||||||
}
|
|
||||||
chat.timer = time.elapsed_seconds_f64();
|
chat.timer = time.elapsed_seconds_f64();
|
||||||
chat.position = choice.goto.clone();
|
chat.position = choice.goto.clone();
|
||||||
chat.message_open = false;
|
chat.message_open = false;
|
||||||
|
|
|
@ -322,7 +322,7 @@ actor 0 59305 0 suitv2
|
||||||
id player
|
id player
|
||||||
wants maxvelocity none
|
wants maxvelocity none
|
||||||
oxygen 0.008
|
oxygen 0.008
|
||||||
health 0.9
|
health 0.3
|
||||||
rotationy 135
|
rotationy 135
|
||||||
|
|
||||||
scene 10 -30 20 test
|
scene 10 -30 20 test
|
||||||
|
|
|
@ -228,7 +228,6 @@ pub enum LogLevel {
|
||||||
Info,
|
Info,
|
||||||
//Debug,
|
//Debug,
|
||||||
Chat,
|
Chat,
|
||||||
Send,
|
|
||||||
//Ping,
|
//Ping,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -296,10 +295,6 @@ impl Log {
|
||||||
self.add(message, sender, LogLevel::Chat);
|
self.add(message, sender, LogLevel::Chat);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn send(&mut self, message: String) {
|
|
||||||
self.add(message, "Me".to_string(), LogLevel::Send);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn warning(&mut self, message: String) {
|
pub fn warning(&mut self, message: String) {
|
||||||
self.add(message, "WARNING".to_string(), LogLevel::Warning);
|
self.add(message, "WARNING".to_string(), LogLevel::Warning);
|
||||||
}
|
}
|
||||||
|
@ -1045,7 +1040,6 @@ fn update_hud(
|
||||||
LogLevel::Achievement => settings.hud_color_console_achievement,
|
LogLevel::Achievement => settings.hud_color_console_achievement,
|
||||||
LogLevel::Warning => settings.hud_color_console_warn,
|
LogLevel::Warning => settings.hud_color_console_warn,
|
||||||
LogLevel::Info => settings.hud_color_console_system,
|
LogLevel::Info => settings.hud_color_console_system,
|
||||||
LogLevel::Send => settings.hud_color_console_send,
|
|
||||||
_ => settings.hud_color_console,
|
_ => settings.hud_color_console,
|
||||||
};
|
};
|
||||||
chat.sections[row].style.color.set_alpha(opacity);
|
chat.sections[row].style.color.set_alpha(opacity);
|
||||||
|
|
|
@ -69,7 +69,6 @@ pub struct Settings {
|
||||||
pub hud_color: Color,
|
pub hud_color: Color,
|
||||||
pub hud_color_fps: Color,
|
pub hud_color_fps: Color,
|
||||||
pub hud_color_console: Color,
|
pub hud_color_console: Color,
|
||||||
pub hud_color_console_send: Color,
|
|
||||||
pub hud_color_console_warn: Color,
|
pub hud_color_console_warn: Color,
|
||||||
pub hud_color_console_system: Color,
|
pub hud_color_console_system: Color,
|
||||||
pub hud_color_console_achievement: Color,
|
pub hud_color_console_achievement: Color,
|
||||||
|
@ -214,7 +213,6 @@ impl Default for Settings {
|
||||||
hud_color: Srgba::hex(COLOR_PRIMARY).unwrap().into(),
|
hud_color: Srgba::hex(COLOR_PRIMARY).unwrap().into(),
|
||||||
hud_color_fps: Srgba::hex("#181818").unwrap().into(),
|
hud_color_fps: Srgba::hex("#181818").unwrap().into(),
|
||||||
hud_color_console: Srgba::hex(COLOR_PRIMARY).unwrap().into(),
|
hud_color_console: Srgba::hex(COLOR_PRIMARY).unwrap().into(),
|
||||||
hud_color_console_send: Srgba::hex(COLOR_SECONDARY).unwrap().into(),
|
|
||||||
hud_color_console_achievement: Srgba::hex(COLOR_SUCCESS).unwrap().into(),
|
hud_color_console_achievement: Srgba::hex(COLOR_SUCCESS).unwrap().into(),
|
||||||
hud_color_console_warn: Srgba::hex(COLOR_WARNING).unwrap().into(),
|
hud_color_console_warn: Srgba::hex(COLOR_WARNING).unwrap().into(),
|
||||||
hud_color_console_system: Srgba::hex(COLOR_SECONDARY).unwrap().into(),
|
hud_color_console_system: Srgba::hex(COLOR_SECONDARY).unwrap().into(),
|
||||||
|
|
Loading…
Reference in a new issue