Joshua Barretto
cf487589e2
Made model cache handle non-humanoids
...
Former-commit-id: 4b3efb70ba24a8e4c8e1d933752e8ea28d3e8dd1
2019-05-14 01:02:37 +01:00
jshipsey
732c43ce11
first quadruped changes
...
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
2019-05-13 19:43:10 -04:00
Joshua Barretto
02890e723c
Merge branch 'asset_bufreader' into 'master'
...
Use bufreader for assets instead of vec<u8>
See merge request veloren/veloren!138
Former-commit-id: de3c1bd5b5bb7ae6fb24a3a8c5daa88f22e124ca
2019-05-13 23:39:39 +00:00
Louis Pearson
5d5042840e
Change vec<u8> to BufReader
...
Former-commit-id: 4ca814a93cf697f79512ea982d68044539092019
2019-05-13 17:28:17 -06:00
Imbris
3a0befee8c
Merge branch 'image_slider' into 'master'
...
Add ImageSlider widget
See merge request veloren/veloren!136
Former-commit-id: 8cba0b156b2ff9f65b6ed3479eab8756fe6aa4ba
2019-05-13 17:20:29 +00:00
Imbris
ca60b86f53
add ImageSlider widget
...
Former-commit-id: 218eb14090365f9ea3c6fb956fcdb989d51aaea2
2019-05-13 13:09:38 -04:00
Forest Anderson
d7266c286c
Merge branch 'fix-lfs-assets' into 'master'
...
Fix lfs assets
See merge request veloren/veloren!135
Former-commit-id: 4bc3537597581e69c64679d3a8fe19e53eacd910
2019-05-13 14:44:59 +00:00
Forest
3333987fcb
Only push on master
...
Former-commit-id: a252869ed2e3c6779411c8f571acf413de173a78
2019-05-13 10:43:06 -04:00
Forest
ac25e27718
Always pull LFS
...
Former-commit-id: 37f76cd968ad778e4e259cca9390e7b10179795d
2019-05-13 09:45:21 -04:00
Joshua Barretto
5c36aaf01f
Merge branch '79-glsl-include' into 'master'
...
Move u_globals to shared included file
See merge request veloren/veloren!124
Former-commit-id: 297d46cfe956881ae7a22528fc4c12b8c5ed5c56
2019-05-13 13:40:02 +00:00
Joshua Barretto
d56a47c0bb
Merge branch 'master' into 'master'
...
Massively increased efficiency of terrain meshing, chunks generate from centre
See merge request veloren/veloren!133
Former-commit-id: 71c0903b7e037fd087c06613e992cd77fc2d3f96
2019-05-13 12:33:39 +00:00
Joshua Barretto
67241fec31
Massively increased efficiency of terrain meshing, chunks generate from centre
...
Former-commit-id: 66217b9974a791044e4b1f3d4580761bd066113a
2019-05-13 13:08:17 +01:00
Joshua Barretto
a8d356e710
Merge branch 'master' into 'master'
...
Switch to actor system, terrain performance improvements
See merge request veloren/veloren!131
Former-commit-id: 363bd800e2bd068e8ef7b1ef167c3a3cee01cf4d
2019-05-13 10:47:47 +00:00
Joshua Barretto
ee380782fb
fmt
...
Former-commit-id: 140f1e4f1809b70881a51a3bd943e1697a9dc0a2
2019-05-13 11:29:35 +01:00
Joshua Barretto
4f53be633e
sync
...
Former-commit-id: 708f80eabb9dc4052d35ed03875ef7ae485d6170
2019-05-13 11:15:03 +01:00
Joshua Barretto
0b1ea359fa
Adjustments to VolMap
...
Former-commit-id: 53ba7185102e7ff17825891d02bd0e26e5fe1076
2019-05-13 11:06:59 +01:00
Joshua Barretto
edfd2290eb
Massively sped up VolMap offset calculations
...
Former-commit-id: 8f3cdf57a77691ca60c0921bc86a79c8cfe36539
2019-05-13 11:06:58 +01:00
Joshua Barretto
216819ca92
fmt
...
Former-commit-id: 4fd53e02969d9d044367d81640a2975043c6953a
2019-05-13 11:06:58 +01:00
Joshua Barretto
761c6e9cf8
Switched to actor system
...
Former-commit-id: d2a482f6209aff7aaa4e747e35ce4a7c8a79cdfc
2019-05-13 11:06:58 +01:00
robojumper
ba10ca38ba
Fix chunk meshing
...
Former-commit-id: d3a53602e4b480ab9db0a2a98e25cbba5081b624
2019-05-13 11:03:47 +01:00
sxv20_
f600eca072
start fixing chunk rendering, noticed stack overflow crash
...
Former-commit-id: 334904276580cd78f5d5e3bf010a86fcd822cfdf
2019-05-13 11:03:47 +01:00
sxv20_
592477752e
move sample() to returning VolMap, incomplete VolMap meshing code
...
Former-commit-id: 77d3db6c3bf28364089647802f83d2d00f3a152d
2019-05-13 11:03:47 +01:00
sxv20_
e20c2a1e00
Move VolMap to HashMap<_, Arc<Chunk>>
...
Former-commit-id: e209891596acbb1705876a1cb7ccce3ac2fe2d45
2019-05-13 11:03:47 +01:00
sxv20_
a23f9d90ea
cache a chunk while cloning to increase performance (?)
...
Former-commit-id: 69c1fa67b13a8de49f2c73e9526f548779e988c1
2019-05-13 11:03:47 +01:00
sxv20_
a5db1fd0a6
fix TODO (unnecessary mpsc clone)
...
Former-commit-id: 6f6319fa6bf86ee4eec4778c6795f71beab21e89
2019-05-13 11:03:47 +01:00
sxv20_
c2a806910b
fix chunks not getting rendered once unloaded and reloaded, remove weightings
...
Former-commit-id: d98d1e9bb767d80173c531e8914163c1cc23d7fc
2019-05-13 11:03:47 +01:00
sxv20_
38da6af3c6
change remeshing queue from LinkedList to HashMap, add remesh weightings
...
Former-commit-id: 28f0826501539848ca97721aff5057ccb4599736
2019-05-13 11:03:47 +01:00
Forest Anderson
c0be580620
Merge branch 'animation-changes' into 'master'
...
Animation changes
See merge request veloren/veloren!132
Former-commit-id: 13cd638c4a6dacea66fc64840df624a1e3405a1c
2019-05-13 02:45:46 +00:00
jshipsey
98380df9b2
pipeline fix
...
Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138
2019-05-12 22:39:16 -04:00
jshipsey
1bc03efa90
minor alignment fix
...
Former-commit-id: ecfa2eff0982e21d523a8a454890a1e6ed6d9bd7
2019-05-12 22:10:47 -04:00
jshipsey
e8c91f753e
Merge branch 'master' of https://gitlab.com/veloren/veloren
...
Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291
2019-05-12 21:52:44 -04:00
jshipsey
dec9632460
animation adjustments
...
Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0
2019-05-12 20:52:30 -04:00
Forest Anderson
413b67e6ad
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 Anderson
b556135ca5
Merge branch 'Gitlab_CI_assets' into 'master'
...
fix the missing assets in artifact
See merge request veloren/veloren!123
Former-commit-id: 214e164e3a8c006e93e231c38d365b4c93f05085
2019-05-12 20:26:02 +00:00
Dominik Broński
d17609bd3d
fix the missing assets in artifact
...
Former-commit-id: a30253d7d624074e0e831a430bceb8f994e6dd20
2019-05-12 20:26:02 +00:00
Forest Anderson
5fbb8b257f
Merge branch 'clean-code-master' into 'master'
...
Cleaned code
See merge request veloren/veloren!129
Former-commit-id: d122fedbd72e2f94a4eeefe85487261923601acd
2019-05-12 20:21:45 +00:00
Forest
3d14d791cf
Cleaned code
...
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
2019-05-12 15:57:39 -04:00
Forest Anderson
49cdd95c84
Merge branch 'master' into 'master'
...
Changed build settings
See merge request veloren/veloren!127
Former-commit-id: bd2be2ac4ebf5a4d2705ffb31d2c696a48ffde44
2019-05-12 19:15:33 +00:00
Joshua Barretto
5df6b25d00
Added run.sh to gitignore
...
Former-commit-id: 1f13cd6f334f5702ab092f595139691b0ff96bd4
2019-05-12 19:01:29 +01:00
Joshua Barretto
a8981378bf
Improved performance and compilation speed for debug builds
...
Former-commit-id: 5d8b1c27a8a2ebfe63797969ee2aba7452a09dd3
2019-05-12 18:43:55 +01:00
Joshua Barretto
189f5f0fd9
Merge branch 'master' into 'master'
...
Rendering on character selection screen, minor raycasting fix and pets
See merge request veloren/veloren!126
Former-commit-id: a83b7c55dfda634a2e9d928135598bb1a461a32f
2019-05-12 13:50:59 +00:00
Joshua Barretto
d8f6025b68
Added rendering to character selection menu
...
Former-commit-id: 82992904639ec2f468c70f43f3f8fe721a98de51
2019-05-12 14:03:08 +01:00
Joshua Barretto
fc0f2f0801
Added option to not stop raycasting on error
...
Former-commit-id: 6e094b6514bcda2fbcdfe44dbb90900b50e939c2
2019-05-12 14:03:08 +01:00
Joshua Barretto
266101c90d
Added basic pets
...
Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f
2019-05-12 14:03:08 +01:00
Joshua Barretto
5d8a03896a
Merge branch 'char_win_ui_rebase' into 'master'
...
Char Window Visuals and assets
See merge request veloren/veloren!125
Former-commit-id: 5c8a80e5e01c13ac184a580e5feb49e64f5e4e1a
2019-05-12 13:01:46 +00:00
Pfauenauge90
66eceb3ca7
Added Grid to main and offhand
...
Former-commit-id: 6395ba9142d6da3e14c7363e0f38f4fc61de6b79
2019-05-12 14:52:43 +02:00
robojumper
ee9f54bacd
Move u_globals to shared included file
...
Former-commit-id: b6122177ce98cd52bc032e2d8414671d3bcb9b5c
2019-05-12 11:23:21 +02:00
Imbris
cec01c0d69
rustfmt
...
Former-commit-id: 227b7f5a55546c678617d157b739e61f15c4aa4b
2019-05-12 00:17:10 -04:00
Pfauenauge90
e7ab006db7
transparency
...
Former-commit-id: 5a0c0f7267347c3758a266ff49670b55c6e6cc0c
2019-05-11 22:35:19 -04:00
Imbris
52cf7c6f94
rebase fix, re-arrange hud img_ids
...
Former-commit-id: a5cb82f74afca531995fceea3ddf7ff53616dd1b
2019-05-11 22:35:15 -04:00
