Imbris
|
ca60b86f53
|
add ImageSlider widget
Former-commit-id: 218eb14090365f9ea3c6fb956fcdb989d51aaea2
|
2019-05-13 13:09:38 -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
|
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
|
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
|
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_
|
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 |
|
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
|
3d14d791cf
|
Cleaned code
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
|
2019-05-12 15:57:39 -04: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
|
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 |
|
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 |
|
Pfauenauge90
|
fc4103561e
|
CharWindow
Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd
|
2019-05-11 21:36:27 -04:00 |
|
Pfauenauge
|
a59f0e57aa
|
char window
Former-commit-id: 2624ddd883c0ff555fc86efce767fda602de52eb
|
2019-05-11 21:36:27 -04:00 |
|
Pfauenauge
|
a6b792f930
|
Char Window
Former-commit-id: 0109555602ba39950f304bd0adc80df6175c3728
|
2019-05-11 21:36:27 -04:00 |
|
Pfauenauge
|
789e448aa3
|
positioning
Former-commit-id: 7583dfac4be650ecabaf49608712c8d3cb952bf5
|
2019-05-11 21:36:26 -04:00 |
|
Pfauenauge
|
3f57ab4f2a
|
positioning
Former-commit-id: 510fcaea11f0e9293e73ba98fb9ad79b5dbbadb5
|
2019-05-11 21:34:50 -04:00 |
|
Pfauenauge90
|
657bba06e9
|
asset update and import
Former-commit-id: 43f616f166c3df87a19f0eca80a65f7a3c0e374c
|
2019-05-11 21:33:48 -04:00 |
|
Pfauenauge
|
bd23732c74
|
char window
Former-commit-id: 0c15336583eeaf32f0d86ef10b16c47f46d4db7f
|
2019-05-11 21:32:38 -04:00 |
|
Pfauenauge
|
5731484940
|
Char Window
Former-commit-id: c44ca056fe76b00e803d96825da69385cfecad39
|
2019-05-11 21:32:36 -04:00 |
|
Pfauenauge
|
5aa5e84a46
|
positioning
Former-commit-id: 4524965ee5fa82fc35c965061079d7b52919a74a
|
2019-05-11 21:32:34 -04:00 |
|
Pfauenauge90
|
757fbdd653
|
Asset Update
Former-commit-id: 2f3e58679059c3c97cec9312c6fa436d5510b901
|
2019-05-11 21:32:30 -04:00 |
|
Pfauenauge
|
15816bdf6d
|
positioning
Former-commit-id: 44e8406af9c2b6db60f78f7ff161b7c700f024fd
|
2019-05-11 21:31:17 -04:00 |
|
Pfauenauge90
|
0f6ec8dce3
|
asset update and import
Former-commit-id: 455500aac3d82e2920bc02c6846ceb815122bb7d
|
2019-05-11 21:31:15 -04:00 |
|
Imbris
|
1948bc6392
|
fix & remove some unused uses, cursor toggle tweak
Former-commit-id: b398b11606d983b7f80364a5689804e3491c218f
|
2019-05-11 10:59:48 -04:00 |
|
Imbris
|
aed6750885
|
add multisampling option to voxel graphics
Former-commit-id: d5ca47cd029226d1268c6d860516bfea6f9c5cf6
|
2019-05-11 10:25:15 -04:00 |
|
Imbris
|
b99a8dea39
|
Stop recreating vertex buffers for ui
Former-commit-id: 6e9326d1bca942e4da70281e3d86b624f9d2504a
|
2019-05-11 10:22:20 -04:00 |
|
Imbris
|
9c07dcfcee
|
multiply image color by supplied color
Former-commit-id: c5e4ccde88d7170db7aa4d3bfce3e0ba1cf5e8c9
|
2019-05-11 10:22:18 -04:00 |
|
Imbris
|
89c06e8359
|
split up voxygen/src/ui/mod.rs
Former-commit-id: e220b1ce38f93fbb295c9aae3591e4b3899f57e4
|
2019-05-11 10:22:17 -04:00 |
|
Imbris
|
13350856db
|
small cleanup
Former-commit-id: 2996ce0cf33337bf52810f1e52b2c02d6eba5c7f
|
2019-05-11 10:22:16 -04:00 |
|
Imbris
|
caea30a34f
|
make ui ignore resize to <1.0 events
Former-commit-id: d4baa8234f6c25f2c28c07c1dbf06e6c191a4127
|
2019-05-11 10:22:16 -04:00 |
|
Forest Anderson
|
cf22cb99e7
|
Ran fmt
Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c
|
2019-05-09 17:30:44 -04:00 |
|
Joshua Barretto
|
89f9589cf0
|
Fixes to head animations
Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a
|
2019-05-09 20:18:13 +01:00 |
|
Joshua Barretto
|
54cc9e137a
|
fmt
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
|
2019-05-09 18:58:16 +01:00 |
|
Joshua Barretto
|
3b44bda43c
|
Secret feature
Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2
|
2019-05-09 18:57:47 +01:00 |
|