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 |
|
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 |
|
Joshua Barretto
|
3705f9a871
|
Added anim_time to animations
Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
2e3288cc29
|
Adjusted view distance and worldgen
Former-commit-id: 01eeb0e48bcb018111c5f32b6252beb11bccd452
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
e6a40bbda2
|
Added jumping and Jump animation state
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
5aa8a67800
|
Added jump button
Former-commit-id: 614614fbe0a8cfc29d28010084078d4441734307
|
2019-05-09 18:57:47 +01:00 |
|
Forest Anderson
|
87fab23dc8
|
Merge branch 'panic-clarity' into 'master'
Issue-83: Voxygen, main, extracting payload from PanicInfo
See merge request veloren/veloren!115
Former-commit-id: 459f40cd6a676a75e5e1eb84f73b8ac94dc8ddb5
|
2019-05-09 17:49:43 +00:00 |
|
Vsevolod Timchenko
|
af4192869d
|
whitespaces fmt fix
Former-commit-id: 1f9296d4f773f2da6e222a89f471f30c77b432fa
|
2019-05-09 20:27:07 +03:00 |
|
Imbris
|
3faf4855cc
|
Merge branch 'cursorgrab' into 'master'
Improve cursor grab
Closes #55
See merge request veloren/veloren!113
Former-commit-id: 56ade58e0a2f55f657f8b714a2216023659b161f
|
2019-05-09 17:02:24 +00:00 |
|
timokoesters
|
a58b5ceb3a
|
Fix bug when pressing ToggleMouse twice while grabbed
Former-commit-id: 9e01b71577fd3dbe570b7aca1e041c32e9a01c66
|
2019-05-09 18:55:13 +02:00 |
|
timokoesters
|
e8cf815143
|
Force ungrab on Key::ToggleCursor
Former-commit-id: 222f5693363662d25cb065fdc104cd079e2c395d
|
2019-05-09 10:55:32 +02:00 |
|
timokoesters
|
a86dc3ae80
|
Remove unused code
Former-commit-id: 80eb4dcdea740323b510e11b6e08cd6e13709dff
|
2019-05-09 06:55:26 +02:00 |
|
timokoesters
|
2309ce599c
|
Move font_ids! into mod.rs
Former-commit-id: 602ea44814a25c068e5c022cedc780e3ddc020ae
|
2019-05-08 22:25:15 +02:00 |
|
timokoesters
|
0e46b00a0c
|
Minor fixes
Former-commit-id: 9c5e90e2bad24e9b5c443bfb1509b18877adf2d6
|
2019-05-08 22:15:58 +02:00 |
|
Vsevolod Timchenko
|
1cfd0de2ba
|
Added unpacking
to panic messages, issue #83
Former-commit-id: 55b45773d049834a7a6cf43bbdf656cba7290f74
|
2019-05-08 23:01:02 +03:00 |
|
timokoesters
|
854271f321
|
Make use of image_ids! in char selection
Former-commit-id: 98a11ae94aa299a8eb9e5e4d69cb99c7753f626b
|
2019-05-08 20:40:34 +02:00 |
|
timokoesters
|
31ab734f90
|
Make use of image_ids! in the main menu
Former-commit-id: 30b040b0ff046d0ae63394a2331866a6aec6b25f
|
2019-05-08 20:19:57 +02:00 |
|
timokoesters
|
f6b27db6dd
|
Improve formatting
Former-commit-id: b2167cd982c37b3716fa74d3e75d27e5cf3c65ce
|
2019-05-08 20:19:38 +02:00 |
|
Imbris
|
470e63a691
|
Remove or uncomment commented code
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
|
2019-05-07 21:59:35 -04:00 |
|
timokoesters
|
a15532f81a
|
Improve cursor grab
Former-commit-id: c1a8b5383bf7682245e2294e5b1d62dae0beb329
|
2019-05-07 22:00:03 +02:00 |
|
timokoesters
|
b3ffc61119
|
Don't let widgets have mutable access to show
Former-commit-id: 4c525c60d25bcc6551ddeabd325992fcd513619d
|
2019-05-07 19:50:53 +02:00 |
|
timokoesters
|
54cc96f0d1
|
Move minimap into own file
Former-commit-id: 7c4a9b0930c899fc8e5089920c3ee5c717561a1a
|
2019-05-07 19:34:30 +02:00 |
|
Imbris
|
81c5a070c5
|
move conrod font out of common
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
|
2019-05-07 02:25:26 -04:00 |
|
Imbris
|
d13430d51e
|
revert chat clicking change (broke scrolling)
Former-commit-id: f43f3fd97c01dc304f29fcc852ab9909e6d00620
|
2019-05-07 01:50:47 -04:00 |
|
Imbris
|
eb3d8310f8
|
rustfmt
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
|
2019-05-07 01:40:03 -04:00 |
|
Imbris
|
99d6c92c8d
|
rebase
Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2
|
2019-05-07 01:39:32 -04:00 |
|
Imbris
|
0fc6dd317f
|
open input box by clicking anywhere on chat
Former-commit-id: f379c52d034b16c5390375899e551b01515cd11e
|
2019-05-07 01:27:24 -04:00 |
|
Imbris
|
5c63f398ba
|
replace typing field with function and cleanup
Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef
|
2019-05-07 01:27:24 -04:00 |
|
Pfauenauge
|
009ca0a130
|
small windows "relative" to opened char window
Former-commit-id: 13d07e3bfce60cd17eaf7447a442c47353d9517e
|
2019-05-07 01:25:33 -04:00 |
|
timokoesters
|
7f709bba0c
|
Prepare relative small windows
Former-commit-id: 6f1046518b49b302d69d51e0596514bf9ded7952
|
2019-05-07 01:25:32 -04:00 |
|
timokoesters
|
a36fcb4243
|
Fix settings to use Show
Former-commit-id: 99c31d8c9914f4b9e6fbcc2b1f72a97a260a725b
|
2019-05-07 01:25:32 -04:00 |
|
Pfauenauge
|
6894e55a24
|
Bag Position
Former-commit-id: af8435d0c078ea1caa388ff0926ef6dae22ab70b
|
2019-05-07 01:25:31 -04:00 |
|
Pfauenauge
|
b7b3c5f3cd
|
positioning
Former-commit-id: d599e046d1944a41eef5423cf3bb0f17f42a246a
|
2019-05-07 01:25:31 -04:00 |
|
timokoesters
|
87e75644ec
|
Fix fonts
Former-commit-id: c7929a0b540099ac67b93563d97be4b8c6639190
|
2019-05-07 01:25:31 -04:00 |
|
Imbris
|
efa2afc5c8
|
re-enable chat focusing
Former-commit-id: 8cbcbba82bcb85fec11638085cff26049838fe6d
|
2019-05-07 01:25:30 -04:00 |
|
Imbris
|
7bade0360e
|
Move Hud's show fields to their own struct
Former-commit-id: 8f546b2c2f40fb74e4daecc982256b441fcdd7fb
|
2019-05-07 01:24:12 -04:00 |
|
timokoesters
|
1c79d06985
|
Fix settings
Former-commit-id: 694387dc670ac2c39d3fbc8915d4819b638fe431
|
2019-05-07 01:22:48 -04:00 |
|
Pfauenauge90
|
6cbd045231
|
positioning
Former-commit-id: 90b626c2900e6bf4924dc290764c2860a5bade98
|
2019-05-07 01:22:47 -04:00 |
|
timokoesters
|
819e0a200f
|
Separate bag + buttons into own file
Former-commit-id: 08e3b640adb85266ce7a739008fa26e1caee0ebf
|
2019-05-07 01:15:49 -04:00 |
|
timokoesters
|
abd960aa48
|
Move skillbar into own file
Former-commit-id: efab633e9b5c1ffc5071a556203490780615cde6
|
2019-05-07 01:13:26 -04:00 |
|
timokoesters
|
08aa8875fd
|
Separate settings and small windows and convert chat
Former-commit-id: 847b0b8cf64b9d2de10b241d37bb7e21c126d314
|
2019-05-07 01:12:56 -04:00 |
|
timokoesters
|
f695973bb2
|
Make fonts work, Remove style
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
|
2019-05-07 01:08:27 -04:00 |
|
timokoesters
|
e8aa680aad
|
Move map into it's own file
Former-commit-id: 5a1b593e3d6b00dad3e3a4d462dfd48592537f64
|
2019-05-07 01:00:48 -04:00 |
|
Imbris
|
8232ffbd33
|
add load_expect, change error reporting
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
|
2019-05-07 00:59:05 -04:00 |
|
Imbris
|
775b5e731e
|
integrate blank graphic, remove Graphic from impls
Former-commit-id: 190e03fe98591e8ab29d1202cf462cf6b51ede4d
|
2019-05-07 00:57:42 -04:00 |
|
Imbris
|
2f9358f167
|
integrate timo's macro change
Former-commit-id: a7657636efe4ce1db8c1714077262585e662c982
|
2019-05-07 00:54:35 -04:00 |
|
Imbris
|
33fbcd1e93
|
formatting tweaks
Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa
|
2019-05-07 00:48:39 -04:00 |
|