Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,191 Commits 151 Branches 18 Tags 2.1 GiB
f3adf6ab5f
Commit Graph

643 Commits

Author SHA1 Message Date
Joshua Barretto
feece604be Restarted worldgen 
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
 2019-05-21 22:51:41 +01:00
Pfauenauge90
c13206d82d Basic worldgen 
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
 2019-05-21 22:51:41 +01:00
Joshua Barretto
5b2da36fd0 Added mega worldgen 
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
 2019-05-21 22:51:41 +01:00
Louis Pearson
7dc087fe93 Create config dir if needed 
Former-commit-id: 280e49f428207d5dc9a88607252df4b9f155d018
 2019-05-20 15:32:16 -06:00
Louis Pearson
8de6d5ad3d Stop saving singleplayer settings to network settings 
Former-commit-id: 06d43eda771e03b6b30d4bdc8ab01d2b3cd6efc2
 2019-05-20 15:05:09 -06:00
Imbris
39caf7e51b Don't allow negative volumes 
Former-commit-id: 35a52235fa4194d40ffc0d8d3243d0653dcca0a5
 2019-05-19 17:50:20 -04:00
Imbris
888bd65036 Add volume adjustment, lower default volume 
Former-commit-id: 1b581ef16ceb4a7a26772352d24df9c84d846c88
 2019-05-19 15:31:32 -04:00
Pfauenauge
13e916d485 visuals in settings - audio 
Former-commit-id: 51bfcdcbed1d8254c966e7a92a472b585ff61c01
 2019-05-19 19:35:40 +02:00
Joshua Barretto
0a9d7d68d5 Merge branch 'VD-Slider' into 'master' 
View distance slider

See merge request veloren/veloren!152

Former-commit-id: c285b72576f47e1e13ee5959669f51c8aa652ea0
 2019-05-19 01:10:42 +00:00
Joshua Barretto
3508e4afcb Added view distance configuration 
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
 2019-05-19 01:45:02 +01:00
Imbris
0349461533 Pass up Vd slider changes to session.rs & fmt 
Former-commit-id: 187a3d286e288d2159fcde292f78e2bc08ec796b
 2019-05-18 19:55:06 -04:00
Pfauenauge
78173b4bce added slider 
Former-commit-id: c01a2601365c9d4d4b03e58ca33d91469cfbba0f
 2019-05-19 01:22:30 +02:00
Imbris
4f970b63ef fix screen shot flipping 
Former-commit-id: 47ed01cd5f91445d1367121d939c01876008f643
 2019-05-18 19:09:23 -04:00
Imbris
7855dfe52f Add screenshot, fullscreen, & debug keys 
Former-commit-id: 9358575794b71535905c5133eb6764284c35fb34
 2019-05-18 17:16:35 -04:00
Imbris
9e9e8be196 Tweak settings change event handling in hud 
Former-commit-id: 7b9a3163f2e85d202ef295cf6bd63de3ce753640
 2019-05-18 17:09:03 -04:00
Louis Pearson
b0f26633d3 Remove lewton, fix filename issue 
Former-commit-id: 067f3bfe8ea4f20741107689bf55b01d7580b983
 2019-05-18 14:26:16 -06:00
Louis Pearson
6b0fc57ce3 Move global maintains above rendering 
Also moves the call to the AudioFrontend constructor to take place in the
GlobalState constructor


Former-commit-id: 0be9df5a7355b6a7d1ce758894568d67df7db11a
 2019-05-18 14:10:02 -06:00
Louis Pearson
22286c24e6 Play random music whenever a track ends 
To support this, a global_state.maintain() method was added that calls
audio.maintain().


Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
 2019-05-18 13:53:57 -06:00
Louis Pearson
315767f19f Add code to ignore jack as an audio device 
Former-commit-id: 1dbaa796f82f2e9be26a3648e9aaca81f3348134
 2019-05-18 13:53:57 -06:00
Louis Pearson
5a04e98725 Change asset paths to be relative 
Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6
 2019-05-18 13:37:44 -06:00
Forest Anderson
2e7984ebc3 Char selection 
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
 2019-05-18 19:03:13 +00:00
Joshua Barretto
7f857daa91 Colour adjustment and server crash fix 
Former-commit-id: 7a1f6dcccc9869472f6044407d063ea86bb12dd3
 2019-05-18 17:47:55 +01:00
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Joshua Barretto
7174830279 fmt 
Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc
 2019-05-17 18:54:56 +01:00
Joshua Barretto
91184356e7 Added chonks 
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
 2019-05-17 18:44:30 +01:00
Imbris
8e0c1b1abd cleanup some warnings, pretty crash string literal 
Former-commit-id: 43492866f624c12c87762a94188c6c193e5bb90c
 2019-05-17 03:55:51 -04:00
Imbris
c780b85f24 Stop crash when minimizing 
Former-commit-id: ca52ae2520bf5616d24f27d98244a470966f3573
 2019-05-17 01:13:14 -04:00
Joshua Barretto
db4be8e492 Updated sphynx 
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
 2019-05-17 00:05:46 +01:00
Joshua Barretto
6f984ca181 Added figure colour to shader and health component 
Former-commit-id: e2c23e5132991cc436a678af43782e31ffc55516
 2019-05-16 23:34:57 +01:00
Joshua Barretto
7b09070fc8 fmt 
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
 2019-05-16 20:23:45 +01:00
jshipsey
6db00e371d popup origin fix 
Former-commit-id: 9a7ba69115e7b574bc2f3bf26afad71e3c682c38
 2019-05-16 01:29:48 -04:00
jshipsey
50fa3cf098 glide anim 
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
 2019-05-16 00:40:35 -04:00
Joshua Barretto
5092df0e7f Improved quadruped origin 
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
 2019-05-15 17:06:58 +01:00
Joshua Barretto
8ef8c178d7 Added test gliding 
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
 2019-05-15 13:26:14 +01:00
Joshua Barretto
8af606e348 Fixed singleplayer logout crash due to orphaned mesh worker 
Former-commit-id: 2b8c5aa0c906223ac043db8137ad95a0e29407c5
 2019-05-15 13:26:14 +01:00
Joshua Barretto
1209f0393d Added figure colour to shader and health component 
Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96
 2019-05-15 13:26:14 +01:00
Imbris
8b97ee14bc add backtrace to panic hook 
Former-commit-id: c831dfa85ebfa1ace05e5ffdec5cc68954394ae1
 2019-05-15 13:24:32 +01:00
Louis Pearson
85e97e16d3 Change vec<u8> to BufReader 
Former-commit-id: 0e91de7976357c96ac58e4f4293c680b9ab98155
 2019-05-15 13:24:32 +01:00
jshipsey
efc019f7a4 idle, run, jump animations 
Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9
 2019-05-15 00:24:36 -04:00
Joshua Barretto
49cc422dfa Fixed quadruped animation selection 
Former-commit-id: 03315efa2c88a4ac3517835b25f7a14cd1599cf0
 2019-05-14 12:37:05 +01:00
jshipsey
2a2b873f56 added skeleton, needs animation fix 
Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e
 2019-05-13 22:24:34 -04:00
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
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
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
Imbris
9d63253627 enable split out character window 
Former-commit-id: 9018814bd43960b9f0f5f8da03794df9c1eb803c
 2019-05-07 00:48:38 -04:00
Imbris
990b42a6b0 remove poison err & Segment Asset impl, cleanup 
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
 2019-05-07 00:47:22 -04:00
Imbris
1d5020634d revamp asset system with a global singleton cache 
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
 2019-05-07 00:44:44 -04:00
timokoesters
b83d45c464 Change macro to make single struct 
Former-commit-id: ed7876d49fccdc7fb11317c13b59b2b4776daef9
 2019-05-07 00:33:06 -04:00
timokoesters
f028aa5a2c Split character_window from hud/mod.rs 
Former-commit-id: 61a09a0ff322dc104d8f4a50eff654706daccde8
 2019-05-07 00:33:06 -04:00
timokoesters
3f0f8b84d1 Fix asset imports 
Former-commit-id: 57e3f136aa61d4e7431f147a79e8ea29fd992328
 2019-05-07 00:30:09 -04:00
timokoesters
c7dd3e96cc Start work on image_ids! and asset loading 
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
 2019-05-07 00:28:05 -04:00
Forest Anderson
6699d7cba2 Merge branch 'backtraces_and_panics' into 'master' 
Fix panic when minimizing, show backtraces when panicking

See merge request veloren/veloren!108

Former-commit-id: 161f1ffe4818cce3535be3913b9da2c476b56334
 2019-05-06 14:42:45 +00:00
robojumper
209b29a870 Slightly improve render target creation code 
Former-commit-id: 7ce92cce35834b006df9dacb4b4dd3e88d603b4e
 2019-05-06 14:06:07 +02:00
robojumper
821ab80c5b Add post-process pipeline 
Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3
 2019-05-06 10:22:47 +02:00
robojumper
31a8e653c4 Fix panic when minimizing, show backtraces when panicking 
Former-commit-id: 0ad401d81a2f7b4d0b766578238d2ab9259f80eb
 2019-05-05 20:42:44 +02:00
robojumper
b2c2d89447 Run cargo fmt 
Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2
 2019-05-05 17:54:08 +02:00
robojumper
647d1dcc9c Smoother and terrain-aware camera 
Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058
 2019-05-05 17:44:56 +02:00
Forest Anderson
aa9c01af35 Merge branch 'master' into 'master' 
Update help window to use player's keybindings

Closes #42

See merge request veloren/veloren!71

Former-commit-id: b35965946b9558a19f29610357d62982f7554588
 2019-05-04 17:52:16 +00:00
Pfauenauge
48d254c7ae esc menu buttons visuals fix 
Former-commit-id: 742857d2f7bcf19a543890bf780d9b46fbca9e0e
 2019-05-03 22:25:23 +02:00
Forest
75f8a638f7 Ran clean code 
Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c
 2019-05-03 09:49:05 -04:00
Pfauenauge90
b2a2eb0907 deleted .gitignore in voxygen 
Former-commit-id: 8a3ede769bb5f74af836bb8975fa2e1b7281c716
 2019-05-03 15:17:53 +02:00
Pfauenauge
505eb3b22e Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren 
Former-commit-id: 53ceca71f2d9a623ed994ad171058f488a42de77
 2019-05-03 13:49:37 +02:00
Pfauenauge
c45494e70f textbox visuals 
Former-commit-id: 4ae65bb009a1e461143b3dbf3f3e52344148fa7c
 2019-05-03 13:48:56 +02:00
Pfauenauge
8240997f8c New Buttons and Input Frame 
Former-commit-id: cf05992eca9e6a75cedda8c873ef268e4bbaade8
 2019-05-03 13:48:55 +02:00
Pfauenauge90
b3bac9a46e Controls Window 
Former-commit-id: 785b039f9241da2f0ba66e7e2db2a14a9b8b54c9
 2019-05-03 13:48:54 +02:00
Pfauenauge
c188affb4e rebase 
Former-commit-id: 9c50e08fc7c4e8afa06f1f995ea1aebd386764c2
 2019-05-03 13:48:53 +02:00
Pfauenauge
c312a8cece rebase 
Former-commit-id: 214203f0d1ccb4e6457395e84b01e4d41467ecdb
 2019-05-03 13:48:52 +02:00
Pfauenauge
dc4ea871ea Controls Window Contents 
Former-commit-id: f3317475e6a06c63ae0a648b29168474b9cf7544
 2019-05-03 13:48:26 +02:00
Pfauenauge
02ba0d969f Controls Window Text 
Former-commit-id: 7f33117748c84644e9f6d7833b5ff44e035e7d76
 2019-05-03 13:48:25 +02:00
Pfauenauge
188e523128 rebase 
Former-commit-id: f44030800c380054af2fef4532bbe93731f128e4
 2019-05-03 13:46:13 +02:00
Pfauenauge
12347ead0b settings window 
Former-commit-id: 3cefa7cc816206fd777f4a94a9b9a1689ed9aa03
 2019-05-03 13:46:12 +02:00
Pfauenauge
cbd754bd90 settings window 
Former-commit-id: a7a72ab6b1db411fcfcf3e03d1db4fce56370af3
 2019-05-03 13:46:12 +02:00
Pfauenauge
1109c55671 Map Window, Settings Window 
Former-commit-id: 337f21010b8c4250a1eaa7ddfbe8d5f2ea1ac412
 2019-05-03 13:46:12 +02:00
Pfauenauge
5852efd896 settings window 
Former-commit-id: 41d85bdc41507bb8c26e5cda2db3135200db7be5
 2019-05-03 13:46:11 +02:00
Pfauenauge
1f369d37bf Map Window, Settings Window 
Former-commit-id: e01861cab1a42540a8b92db46debf95ede3978aa
 2019-05-03 13:46:11 +02:00
Pfauenauge
632ecabef9 Map Window, Settings Window 
Former-commit-id: a94f57941d95cc271a5642e54af7e6ddf373cd18
 2019-05-03 13:40:48 +02:00
Pfauenauge
cc44e86a24 textbox visuals 
Former-commit-id: 8a929c46ebffea8c781817bd4535bf638e605fcb
 2019-05-03 13:21:44 +02:00
Pfauenauge
b2918c2ebc New Buttons and Input Frame 
Former-commit-id: 140b27f9d41de04eb7018d1bbe65012af889a271
 2019-05-03 13:02:03 +02:00
Pfauenauge90
0dbe9c7846 Controls Window 
Former-commit-id: e6e83aaa0eb5606b59581c3005b30e969123bb56
 2019-05-02 20:06:23 +02:00
Pfauenauge
77397788e7 rebase 
Former-commit-id: d40850ca70c5c833f17cba6a9f16de8c63bb5717
 2019-05-02 14:44:51 +02:00
Yeedo
b7ba7f0795 Use shorter help text format, compact stuff into one format!() 
Former-commit-id: 345bef9a2f0714986e4ba6fb24b0bc150023a12e
 2019-05-01 23:15:43 +01:00
Pfauenauge
5362ac7289 rebase 
Former-commit-id: 047a4ffcad326721eaff6f77eb9c8b57cfa0b2b4
 2019-05-01 23:47:09 +02:00
Pfauenauge
8c35f06ed7 Controls Window Contents 
Former-commit-id: f11a9b4da250ba9bd095220efc9e8fc97d32c983
 2019-05-01 23:20:31 +02:00
Pfauenauge
1ba1eb20c7 Controls Window Text 
Former-commit-id: 2e479f29af73fd36b5cb8e6f34b8d2d4265dd100
 2019-05-01 15:50:41 +02:00
Pfauenauge
777f4066d4 changed char head and offset 
Former-commit-id: 6e9ca7249a33504bc0b7cf8f5b5591ead0399151
 2019-05-01 14:11:55 +02:00
Pfauenauge
532a570923 rebase 
Former-commit-id: b3eef84c3a76629e399827e12327556b4c8c7ffa
 2019-04-30 13:49:29 +02:00
Pfauenauge
85bdff364d settings window 
Former-commit-id: b85c0f656c331195bd9c35f57a2609cd4f34f3fa
 2019-04-30 12:59:55 +02:00
Pfauenauge
1a12bc91a1 settings window 
Former-commit-id: 1fc6e52bb860c2f114114bd75ef0b260d9f43871
 2019-04-30 12:59:10 +02:00
Pfauenauge
e12a1a623a Map Window, Settings Window 
Former-commit-id: 72ac20ecdcaccf39c1691be1fbdcb5305d900e78
 2019-04-30 12:58:30 +02:00
Pfauenauge
052c5ecbda settings window 
Former-commit-id: 0dd430bdff017ab95f8df35403c5f4b6d8f10198
 2019-04-30 12:57:34 +02:00
Pfauenauge
bbbcfd15ba Map Window, Settings Window 
Former-commit-id: 74560f37005ec0dc1b5fda6dc18e2b56d74f598d
 2019-04-30 12:54:46 +02:00
Yeedo
f1e268986b cargo fmt, also remove a stray <<<<HEAD thing 
Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef
 2019-04-29 22:23:31 +01:00
Yeedo
164feaa616 fix merge conflicts 
Former-commit-id: 72614e5d57607a2095161857df45ce746e8c1b06
 2019-04-29 22:13:14 +01:00
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
Forest Anderson
0ca4b55322 Merge branch 'clean-up-gitignore' into 'master' 
Fix gitignore and delete gitignores in subdirs

See merge request veloren/veloren!91

Former-commit-id: 689231e73e7a97a49fb3d20d76ccc43af3f2681a
 2019-04-29 20:14:52 +00:00
Monty Marz
c7b61d5626 New Settings Window and Map Window 
Former-commit-id: ca6d1c937193cb29afb2dd484c596b79c947f36e
 2019-04-29 19:04:52 +00:00
timokoesters
f35e8d7b98 Fix gitignore and delete gitignores in subdirs 
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
 2019-04-29 20:43:04 +02:00
Forest Anderson
3c45d3c996 Merge branch 'ao-artifact-fix' into 'master' 
Fix ambient occlusion artifact

See merge request veloren/veloren!89

Former-commit-id: b529f9df722d8b174b0c8e5ce9ef2d32965d7294
 2019-04-29 17:00:56 +00:00
Erocs
c68f33babe Add VOXYGEN_LOG env variable to allow detailed terminal logging. 
Former-commit-id: 01c29a65311dbd6a4739be5aca9865d4ac0872d9
 2019-04-29 16:56:38 +00:00
robojumper
cf88e9a5b1 Line endings are hard 
Former-commit-id: 3a0e48b7571ff706feeff4e089fb9c5d63f6ac7a
 2019-04-29 17:41:12 +02:00
robojumper
0bd84b58ec Fix occlusion artifact 
Former-commit-id: 23be3f1173706076802809576e3455833e64b4e4
 2019-04-29 17:39:35 +02:00
Forest Anderson
c95bee9838 Merge branch '12-terrain-ao' into 'master' 
Add terrain and figure ambient occlusion

Closes #12

See merge request veloren/veloren!84

Former-commit-id: 943648d9ca3399e07a275946487d3431ba3832de
 2019-04-29 13:14:36 +00:00
robojumper
7091557b82 Rename mod ao to vol 
Former-commit-id: ef126e03761b18151594780777fa27e94efe24d7
 2019-04-28 23:35:47 +02:00
robojumper
021c6eeda1 Generalize meshing and AO code over terrain, figure 
Former-commit-id: f0a91173ec5a0a9c683e6d1c222cb74e858625b7
 2019-04-28 19:12:45 +02:00
robojumper
32509d2fb1 Add terrain ambient occlusion 
Former-commit-id: de73dcb09f68bcad5dc7431c30849e16f68c5ab7
 2019-04-28 17:10:09 +02:00
Pfauenauge
3773653072 Closable minimap 
Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32
 2019-04-28 15:56:40 +02:00
Yeedo
0dbdb185d4 Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: 2f341c1de302f5600436a3ded1c69af7c9b2c329
 2019-04-28 14:19:08 +01:00
Yeedo
c032e60d12 Tiny fix to prevent settings from permanently being marked as changed 
Former-commit-id: c12d760a22926eebc2661be1db4609546286c89a
 2019-04-28 14:19:08 +01:00
Yeedo
dc5ec137e9 Update help window to use player's keybindings (fix #42) 
Former-commit-id: b5bc8a8801fd4633ec94ea53a8973bcb891a4fd6
 2019-04-28 14:19:08 +01:00
Yeedo
ad1fc20cfe Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: 5b29776d3f37fbf87842bc61c8d287fe8e66b691
 2019-04-28 14:19:08 +01:00
Yeedo
00e92e5ea2 Tiny fix to prevent settings from permanently being marked as changed 
Former-commit-id: 99927ee1ca6c1cabb5268353690ec88425b7ae3d
 2019-04-28 14:19:08 +01:00
Yeedo
e1fc901b5f Update help window to use player's keybindings (fix #42) 
Former-commit-id: c79b4184b279b2e6fbaac8e0b7c641741d8eb51e
 2019-04-28 14:19:08 +01:00
Yeedo
44f8e834fc Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: a0e023c1cce1677cd1178490df9c569b774db6b6
 2019-04-28 14:19:08 +01:00
Yeedo
48747dd9a9 Tiny fix to prevent settings from permanently being marked as changed 
Former-commit-id: ce120495a91ce0306bcb010923cd340fc70b87db
 2019-04-28 14:19:08 +01:00
Yeedo
488132f63b Update help window to use player's keybindings (fix #42) 
Former-commit-id: b1d374e83ab134a094b664ada8f35916e4734602
 2019-04-28 14:19:08 +01:00
Yeedo
be9a399269 Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae
 2019-04-28 14:19:08 +01:00
Yeedo
7593d4e821 Tiny fix to prevent settings from permanently being marked as changed 
Former-commit-id: 665a8851526c1386e497064e2b0f3f8689db60d8
 2019-04-28 14:19:08 +01:00
Yeedo
50c6518d89 Update help window to use player's keybindings (fix #42) 
Former-commit-id: 5f35a153f05b48ae8c21ae9735080c5c7392e2dc
 2019-04-28 14:19:08 +01:00
Pfauenauge90
0afbba3303 FPS display moved, changes to windows 
Former-commit-id: 141d250e29273f59edf661eff7fc7ebd88754435
 2019-04-28 13:18:00 +02:00
Pfauenauge90
33515bd04c removed test_assets in voxygen 
Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca
 2019-04-28 13:18:00 +02:00
timokoesters
a4d7d0d488 Implement StartSingleplayerState 
Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe
 2019-04-27 22:57:55 +02:00
Joshua Barretto
b72c6b7185 Merge branch 'master' into 'master' 
bag visuals fix

See merge request veloren/veloren!75

Former-commit-id: 30b26e73c0d43ef4f0c3d55154547e5d010a33a7
 2019-04-25 21:59:55 +00:00
Pfauenauge
d7be49def1 Minimap changes, grass colour adjusted 
Former-commit-id: 9dd743eb6277c76c0b596592bc8bec4a875038b5
 2019-04-25 23:43:32 +02:00
timokoesters
fb0b0f682a Fix duplicated code 
Former-commit-id: 3096669413032d1bdb43cb349c333948e497b538
 2019-04-25 22:59:11 +02:00
Pfauenauge
bf8bb9180b bag visuals fix 
Former-commit-id: e73f822883badd76d823c69984675a76e9bbbf1e
 2019-04-25 22:33:14 +02:00
Joshua Barretto
f1b63732af Merge branch 'master' into 'master' 
Terrain

Closes #5

See merge request veloren/veloren!66

Former-commit-id: 01d1eb1e0aaae62d0c2a53390fd847db524d217e
 2019-04-25 19:35:35 +00:00
Forest Anderson
cabb06717b Merge branch 'show-mouse-esc' into 'master' 
Show mouse on Esc, hide when pressing again

Closes #28

See merge request veloren/veloren!61

Former-commit-id: 37d5792a563f4cce2f2c9f13d3d46cf098caf27f
 2019-04-25 18:27:08 +00:00
Joshua Barretto
f136a63f69 Adjusted terrain loading and meshing performance 
Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2
 2019-04-25 17:52:11 +01:00
Joshua Barretto
0b0c71592c Fixed orientation issue 
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
 2019-04-25 17:52:11 +01:00
Joshua Barretto
9105bf0811 Added better terrain collisions 
Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f210de09df Added raycasting (needs testing) and basic character terrain collision 
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
 2019-04-25 17:52:11 +01:00
Joshua Barretto
61afb98869 Foobar 
Former-commit-id: adac9eea1bd685a8eee275e5a05a74c287762e22
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f9f434a1c2 Started work on worldgen 
Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d
 2019-04-25 17:52:11 +01:00
Louis Pearson
b0ebbd5631 Use the directory defined by the OS to store configuration files 
Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f
 2019-04-25 10:24:00 -06:00
Joshua Barretto
7e1ef46e4d Merge branch 'pfauenauge-fix' into 'master' 
Update UI (Pfauenauge)

See merge request veloren/veloren!68

Former-commit-id: 43d549dbb8882937df929f618325163d22c919a4
 2019-04-25 12:25:30 +00:00
Joshua Barretto
dc86b4d14e Removed old commented logging code 
Former-commit-id: 9b20f7b7a979de3377f1da84d46e23ddd0ef6c11
 2019-04-25 13:08:47 +01:00
Joshua Barretto
abaab5787b Made message output smaller 
Former-commit-id: 21eee7126baf3f85468dc54c5e31cbb4deda9667
 2019-04-25 13:08:46 +01:00
Joshua Barretto
03051248b9 Added user-friendly error output for Voxygen 
Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
 2019-04-25 13:08:46 +01:00
Joshua Barretto
d04db4f6dc Merge branch 'master' into 'master' 
velocity tilt, run adjustments

See merge request veloren/veloren!69

Former-commit-id: 90a449e76431bb11bf748b887876c0e88db9e566
 2019-04-25 12:08:01 +00:00
Louis Pearson
2a6a0a2a3e Fix default server loading 
Former-commit-id: 2273a32327c5268e4f6d5cce97bd58792a385c71
 2019-04-25 02:45:01 -06:00
Louis Pearson
feb0610448 Ran rustfmt on ui.rs 
Former-commit-id: 7ee721023ce69de122993b9c94b0bd3fa739e154
 2019-04-25 02:35:08 -06:00
Louis Pearson
d7e9caf5de Adjust server list UI 
Former-commit-id: 61587cbd540c71bc9c264a744b89b8d88ec7ac15
 2019-04-25 02:35:08 -06:00
Louis Pearson
dadbfb9d85 Add clickable server buttons 
Former-commit-id: d56b65b83db590991a2a42a95caa7b41a216052c
 2019-04-25 02:35:08 -06:00
Louis Pearson
d7c80d0afc Add basic UI to view saved servers 
Former-commit-id: 85cc946ac3684aaba64a03997790ef5ab06dbbd7
 2019-04-25 02:35:08 -06:00
Louis Pearson
15c2cdb2ef Add networksettings and integrate with main menu ui 
Former-commit-id: f04532e03f8262b9751ae4a68259637f7de0344c
 2019-04-25 02:35:08 -06:00
timokoesters
e36ca0bc59 Fix unnecessary if 
Former-commit-id: 303b140a06045a7eb3406402d5e30480571a713d
 2019-04-25 10:27:18 +02:00
jshipsey
c0a8a677b7 simplified scaling code 
Former-commit-id: 9e35a57ea812f1446958daac2ccd4c3492d19347
 2019-04-24 23:33:36 -04:00