jshipsey
d6fc1c640a
pipeline fix
...
Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138
2019-05-12 22:39:16 -04:00
jshipsey
90ccc14c34
Merge branch 'master' of https://gitlab.com/veloren/veloren
...
Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291
2019-05-12 21:52:44 -04:00
jshipsey
6578fd09c3
animation adjustments
...
Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0
2019-05-12 20:52:30 -04:00
Forest Anderson
3dd26fecc8
Merge branch 'master' into 'master'
...
Fixes match pattern code that rendered an actionable branch unreachable.
See merge request veloren/veloren!120
Former-commit-id: 06bcf5a6caf32fa80576d56766571c7f9ce7d54d
2019-05-12 20:40:09 +00:00
Forest
b0105c8525
Cleaned code
...
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
2019-05-12 15:57:39 -04:00
Joshua Barretto
c62f28c96d
Improved performance and compilation speed for debug builds
...
Former-commit-id: 5d8b1c27a8a2ebfe63797969ee2aba7452a09dd3
2019-05-12 18:43:55 +01:00
Joshua Barretto
bd0cd0b4e1
Added option to not stop raycasting on error
...
Former-commit-id: 6e094b6514bcda2fbcdfe44dbb90900b50e939c2
2019-05-12 14:03:08 +01:00
Joshua Barretto
c25d4ee9a3
Added basic pets
...
Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f
2019-05-12 14:03:08 +01:00
timokoesters
431e30c6e2
Add TODO comment
...
Former-commit-id: fdc9e6d65d9d534e238a6ba2d1c2e66f194d975e
2019-05-11 21:48:05 +02:00
timokoesters
6fd933eccd
Temporary fix for falling into void
...
Former-commit-id: 8e3d9c0c34e897f13cc60d5968f390ed0107dd76
2019-05-11 21:38:05 +02:00
MidgeOnGithub
0ff7d4a3e8
Fixes match pattern code that rendered an actionable branch unreachable.
...
Former-commit-id: 69f562bf54307ab7402dabe52e07a7a46ea4c4b1
2019-05-10 23:38:19 -04:00
Forest Anderson
bf7600eac8
Ran fmt
...
Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c
2019-05-09 17:30:44 -04:00
Joshua Barretto
fa6516cfb2
Fixes to head animations
...
Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a
2019-05-09 20:18:13 +01:00
Joshua Barretto
ff2a02a6da
fmt
...
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
2019-05-09 18:58:16 +01:00
Joshua Barretto
c564f7deca
Secret feature
...
Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2
2019-05-09 18:57:47 +01:00
Joshua Barretto
2397a4c5b2
Smartened up terrain generation
...
Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
2019-05-09 18:57:47 +01:00
Joshua Barretto
4f17f6fa2b
Fixed running animation, changed movement physics
...
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
2019-05-09 18:57:47 +01:00
Joshua Barretto
747a063d5a
Added anim_time to animations
...
Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487
2019-05-09 18:57:47 +01:00
Joshua Barretto
5cb8bcb5d7
Added jumping and Jump animation state
...
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
2019-05-09 18:57:47 +01:00
Joshua Barretto
f56ca587b0
Added a delta time cap to avoid missing important physics events
...
Former-commit-id: e9f14ddda0963537ae6593c2dacc6a877f88c824
2019-05-09 18:57:47 +01:00
Joshua Barretto
7259da6aa4
Significantly upped view distances
...
Former-commit-id: 4cd306ebfa1acd765cb68d4a6d5a026b43fafa2f
2019-05-09 18:57:47 +01:00
Joshua Barretto
0516bb3fde
Added lz4 compression to networking
...
Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
2019-05-09 18:57:47 +01:00
Joshua Barretto
50aecde1ea
Added basic byte XOR checksum
...
Former-commit-id: 2e8c23ce51038fd7442cc489d9cb45838f3378c3
2019-05-09 18:57:47 +01:00
Forest Anderson
a04c7d6256
Merge branch 'fix-doc-test' into 'master'
...
Fix doc test
See merge request veloren/veloren!112
Former-commit-id: 7330a2022ac892a60a7c9df7ac42d7b054622301
2019-05-08 23:06:07 +00:00
Imbris
fc535314d8
Remove or uncomment commented code
...
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
2019-05-07 21:59:35 -04:00
timokoesters
009186edbf
Fix doc test
...
Former-commit-id: e08cb9fdfca5b3d12a34220ef4af042d6fb913e6
2019-05-07 20:59:06 +02:00
timokoesters
bfbe53e9a6
Fix doc test
...
Former-commit-id: e347ad79dd229d72f70820189e6ae6011868c5ef
2019-05-07 20:36:07 +02:00
Imbris
3077c002cc
move conrod font out of common
...
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
2019-05-07 02:25:26 -04:00
Imbris
c6aecbfded
rustfmt
...
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
2019-05-07 01:40:03 -04:00
timokoesters
342909a2b2
Make fonts work, Remove style
...
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
2019-05-07 01:08:27 -04:00
timokoesters
5eec2fc36b
Remove unnecessary debug from try_open_with_path
...
Former-commit-id: 891d24c247d15f406ebd24ca923b62e6f43bf9ea
2019-05-07 01:00:48 -04:00
Imbris
5a04e9d99b
small comment
...
Former-commit-id: 13e443edbb52e1c1423446168235c986b8999de0
2019-05-07 00:59:06 -04:00
Imbris
d4e554241c
add load_expect, change error reporting
...
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
2019-05-07 00:59:05 -04:00
Imbris
120b4270d8
formatting tweaks
...
Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa
2019-05-07 00:48:39 -04:00
Imbris
00bab4f82f
remove poison err & Segment Asset impl, cleanup
...
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
2019-05-07 00:47:22 -04:00
Imbris
d71d289179
revamp asset system with a global singleton cache
...
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
2019-05-07 00:44:44 -04:00
timokoesters
426cbd9c3c
Start work on image_ids! and asset loading
...
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
2019-05-07 00:28:05 -04:00
robojumper
ea64600ad0
Run cargo fmt
...
Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2
2019-05-05 17:54:08 +02:00
robojumper
da2bb3ee51
Smoother and terrain-aware camera
...
Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058
2019-05-05 17:44:56 +02:00
Imbris
143b0cf383
add nightly feature back for specs -> shred
...
Former-commit-id: b483f75c10cc47faa66ab8063f7747e654068634
2019-05-01 14:46:06 -04:00
Imbris
a194492495
Store thread pool in State, Remove unnecessary dep
...
Former-commit-id: cbce09915267f264801c174817b97ed3528715fd
2019-05-01 14:10:43 -04:00
Forest Anderson
29095c3a64
Ran fmt on codebase
...
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
2019-04-29 20:37:19 +00:00
timokoesters
b300a30eb4
Fix gitignore and delete gitignores in subdirs
...
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
2019-04-29 20:43:04 +02:00
Joshua Barretto
d84677106b
Remove post debugging
...
Former-commit-id: 4a82bf8b6178fb88d5a6ea93706fb4e97ac2256d
2019-04-25 20:25:22 +01:00
Joshua Barretto
f9b2e32c68
Added chunk deletion
...
Former-commit-id: 63c29e43c4dc28097aaf4e0ff72977c7db5cc28f
2019-04-25 20:08:26 +01:00
Joshua Barretto
159e18341d
Adjusted terrain loading and meshing performance
...
Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2
2019-04-25 17:52:11 +01:00
Joshua Barretto
ac3385b1a3
Fixed orientation issue
...
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
2019-04-25 17:52:11 +01:00
Joshua Barretto
abdaca6182
Worked on improving networking and terrain
...
Former-commit-id: e5ce819036a01f274c1c114bcd3b50fa42858703
2019-04-25 17:52:11 +01:00
timokoesters
618b29b93b
Fix ray issue after max_iteration
...
Former-commit-id: 55afdeeb0358934e3874ab3ca573e8cc71904ea1
2019-04-25 17:52:11 +01:00
timokoesters
1c29c13973
Fix ray position
...
Former-commit-id: 772d5652d44c9467d22c9c93547ac154ce3110b3
2019-04-25 17:52:11 +01:00