Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

md5sum assets

Browse Source
This commit is contained in:
Forest Anderson 2019-10-09 22:42:39 +00:00
parent 4742c4bffb
commit e7b97e0c66
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.gitlab-ci.yml
View File

@ -1,7 +1,9 @@
image: registry.gitlab.com/veloren/veloren-docker-ci:latest
variables:
GIT_STRATEGY: none
GIT_STRATEGY: fetch
GIT_DEPTH: 3
GIT_CLEAN_FLAGS: -f
stages:
- optional-builds
@ -9,13 +11,6 @@ stages:
- post
before_script:
- mkdir -p veloren
- cd veloren
- if [ ! -d ".git" ]; then git clone https://gitlab.com/veloren/veloren.git .; fi
- git clean -f
- git lfs install
- git lfs fetch
- git lfs checkout $CI_COMMIT_SHA
- source $HOME/.cargo/env
- df -h
- free -h
@ -38,7 +33,7 @@ optional-debug:linux:
cache:
key: "cache-linux-debug"
paths:
- veloren/
- ./
script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --verbose && cd ..
- cd server-cli && VELOREN_ASSETS=assets cargo build --verbose && cd ..
@ -57,7 +52,7 @@ optional-debug:windows:
cache:
key: "cache-windows-debug"
paths:
- veloren/
- ./
script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu && cd ..
- cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu && cd ..
@ -84,7 +79,7 @@ optional-release:linux:
cache:
key: "cache-linux-release"
paths:
- veloren/
- ./
script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --release && cd ..
- cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --release && cd ..
@ -103,7 +98,7 @@ optional-release:windows:
cache:
key: "cache-windows-release"
paths:
- veloren/
- ./
script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release && cd ..
- cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release && cd ..
@ -126,7 +121,7 @@ check:
cache:
key: "cache-linux-debug"
paths:
- veloren/
- ./
tags:
- veloren-docker
script:
@ -137,7 +132,7 @@ code-quality:
cache:
key: "cache-linux-debug"
paths:
- veloren/
- ./
tags:
- veloren-docker
script:
@ -153,7 +148,7 @@ unittests:
cache:
key: "cache-linux-debug"
paths:
- veloren/
- ./
when: delayed
start_in: 5 seconds
tags:
@ -166,7 +161,7 @@ benchmarks:
cache:
key: "cache-linux-release"
paths:
- veloren/
- ./
when: delayed
start_in: 5 seconds
tags:
@ -180,7 +175,7 @@ linux:
cache:
key: "cache-linux-release"
paths:
- veloren/
- ./
when: delayed
start_in: 5 seconds
only:
@ -208,7 +203,7 @@ windows:
cache:
key: "cache-windows-release"
paths:
- veloren/
- ./
when: delayed
start_in: 5 seconds
only:

4
voxygen/src/hud/bag.rs
View File

@ -7,9 +7,8 @@ use crate::ui::{ImageFrame, Tooltip, TooltipManager, Tooltipable};
use client::Client;
use conrod_core::{
color, image,
position::Relative,
widget::{self, Button, Image, Rectangle /*, Scrollbar*/},
widget_ids, Color, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
widget_ids, Color, Positionable, Sizeable, Widget, WidgetCommon,
};
widget_ids! {
@ -31,6 +30,7 @@ widget_ids! {
}
#[derive(WidgetCommon)]
#[allow(dead_code)]
pub struct Bag<'a> {
client: &'a Client,
imgs: &'a Imgs,

2
voxygen/src/mesh/terrain.rs
View File

@ -232,7 +232,7 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
pos,
offs,
&colors,
|pos, norm, col, ao, light| {
|pos, norm, col, _ao, light| {
FluidVertex::new(pos, norm, col, light, 0.3)
},
false,