Commit Graph

391 Commits

Author SHA1 Message Date
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
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
Joshua Barretto
cf4e02252a Smartened up terrain generation
Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
2019-05-09 18:57:47 +01:00
Joshua Barretto
94fd0b1a22 Fixed running animation, changed movement physics
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
2019-05-09 18:57:47 +01:00
Joshua Barretto
1e1b005cbb Post-processing tests
Former-commit-id: 133d737a58d9de4fa0b41268cc2f88d2427d3637
2019-05-09 18:57:47 +01:00
jshipsey
ac78d322d6 animation orientation fix, first jump
Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90
2019-05-09 18:57:47 +01:00
Joshua Barretto
6da495f0bd Fixed window resizing
Former-commit-id: 81f2e18274aadb53b07704cf10c5c27efdccb032
2019-05-09 18:57:47 +01:00
Joshua Barretto
df9b64355a Improved singleplayer error handling
Former-commit-id: 0e33493bbb588ab0cd5278ec92b5859712446f4b
2019-05-09 18:57:47 +01:00
Joshua Barretto
e5db851f30 Added FXAA to post-processing shader
Former-commit-id: 9cfdb3762b63688d1b59d65066c90355c7209c62
2019-05-09 18:57:47 +01:00
Joshua Barretto
c48a82e78d Adjusted sun and added F16 render target
Former-commit-id: 5585e0038846ef34378933eeb9051714ffe2c100
2019-05-09 18:57:47 +01:00
Joshua Barretto
871767ada0 Made single-player server start on random unused port
Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd
2019-05-09 18:57:47 +01:00