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
Joshua Barretto
eff6b19ed0
Merge branch 'networksettings' into 'master'
...
Store username and servers in settings.toml
See merge request veloren/veloren!49
Former-commit-id: 43ad087a201cee29c09ad20ef64fd75b332165b7
2019-04-25 08:52:59 +00:00
timokoesters
0bb35fe232
Update assets
...
Former-commit-id: c3692838320a5da02525d9675de3f55249a39100
2019-04-25 10:50:56 +02: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
b9725aa4b1
Merge branch 'master' of https://gitlab.com/jshipsey/fresh
...
Former-commit-id: d0e5a6e3c337cbe0907664a94782959bf588c566
2019-04-24 23:38:50 -04:00
jshipsey
c0a8a677b7
simplified scaling code
...
Former-commit-id: 9e35a57ea812f1446958daac2ccd4c3492d19347
2019-04-24 23:33:36 -04:00
jshipsey
0a34bfab9b
run animation incremental tweaks
...
Former-commit-id: fa43d89890e22da665dc29606baed46e23f8eb6e
2019-04-24 23:32:35 -04:00
jshipsey
bc5074a2b8
velocity tilt
...
Former-commit-id: 362232bff35784828ee8766e77dadc4e83bf3753
2019-04-24 23:31:18 -04:00
jshipsey
56a8a247cc
simplified scaling code
...
Former-commit-id: 2a1c8450f002862f67873c375674413902e138ef
2019-04-24 23:30:06 -04:00
jshipsey
9c15fa08a8
run animation incremental tweaks
...
Former-commit-id: 3abad8762a7a2daaf96c955cf89bcf5713ae7318
2019-04-24 23:28:51 -04:00
jshipsey
9510edd148
velocity tilt
...
Former-commit-id: 34443765d993ec5036d2b3e08e7dff5a68193de6
2019-04-24 23:26:22 -04:00
jshipsey
97603120a2
simplified scaling code
...
Former-commit-id: 3f85bf6aef1f3931570fafb8b2aa5b0dc26f8fad
2019-04-24 23:25:05 -04:00
jshipsey
4d0660affb
run animation incremental tweaks
...
Former-commit-id: c80f014baf3b9ddb73bb01cf6fd83272d890ab55
2019-04-24 23:25:05 -04:00
jshipsey
df39bcb2dc
velocity tilt
...
Former-commit-id: 7373827734c9a65813537d7a1cb49b400c7d6fb8
2019-04-24 23:25:05 -04:00
timokoesters
a981d57379
Fix formatting
...
Former-commit-id: 5fd593a918f22d02b2c5be246c81ef1e8042ad69
2019-04-24 22:33:34 +02:00
timokoesters
8314fc9439
Update UI
...
Former-commit-id: 644483e15f2d4db6ab2400ffe4fb202729769217
2019-04-24 21:55:22 +02:00
jshipsey
d51594006c
simplified scaling code
...
Former-commit-id: 20bf8a426f9fc1fad523ed41688e3d419037a4a6
2019-04-23 20:36:33 -04:00
jshipsey
af194d2e28
run animation incremental tweaks
...
Former-commit-id: f8800cad3d50eb3c536a1673bbe216b3098ce81e
2019-04-23 20:17:50 -04:00
Forest Anderson
f85e3546cf
Merge branch 'fps_counter' into 'master'
...
Add debug window, window toggle, fps counter
See merge request veloren/veloren!63
Former-commit-id: 38e5d85a0db9a01c877f975f91526cd2dbe1c1fb
2019-04-23 17:57:49 +00:00
sxv20_
0127cae5d0
remove TODO comment
...
Former-commit-id: cd90cd0403d03b6c8c9477a7377ad25288cc1488
2019-04-23 18:36:29 +01:00
Dominik Broński
dd2954ebf1
Merge branch 'fix-chat-cli' into 'master'
...
Fix chat-cli not compiling
See merge request veloren/veloren!64
Former-commit-id: 7ca03fbe4b0648094683c665f3831d100dfd2413
2019-04-23 12:30:51 +00:00
timokoesters
5cb368dddc
Fix chat-cli not compiling
...
Former-commit-id: b69c0e8208374af3eef0d996137a5e7ebbfe9a16
2019-04-23 14:28:45 +02:00
Dominik Broński
e3de381001
Merge branch 'master' into 'master'
...
Client States and Basis for Character Creation
Closes #3 i #39
See merge request veloren/veloren!51
Former-commit-id: 895693c2e0821497312f2a6400a0ffe73b12d154
2019-04-23 12:24:33 +00:00
timokoesters
701755a8e2
Add disconnect handling
...
Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f
2019-04-23 14:01:16 +02:00
timokoesters
7baecff1f0
Clean up figure cache models when necessary
...
Former-commit-id: 7653217b2f4c02f5c179e35907fa47c3526b2a2e
2019-04-23 13:59:16 +02:00
timokoesters
df7a145bbc
Better formatting
...
Former-commit-id: 4316514f4f58dca8ed21dae00fad7a6df36b9ff1
2019-04-23 12:12:22 +02:00
timokoesters
7fc2b3490c
Answer with WrongMessage when trying to RequestState Connected
...
Former-commit-id: 8384caae9f19d05f174457ab8efc6046ce30bd8c
2019-04-23 11:14:35 +02:00
timokoesters
3bb7de61ef
Fix .internal()
...
Former-commit-id: 63207ee9bdc1fa31dcff0c5ad93c6a71857fe165
2019-04-22 23:00:25 +02:00
timokoesters
3bf09f9f9c
Handle errors with error_state instead of disconnect
...
Former-commit-id: cad5bbf9a5bb22dc6adf81d248d85d6a5d6aa140
2019-04-22 23:00:25 +02:00
timokoesters
8b2ed89982
Fix chat-cli
...
Former-commit-id: fe8f13dfb217c6feab78c4d473c9ef59634168f3
2019-04-22 23:00:25 +02:00
timokoesters
06693136b6
Fixed names, debug and notify
...
Former-commit-id: f58dedf7c4eb9b284982588fc6b19bbe3edb0391
2019-04-22 23:00:24 +02:00
timokoesters
37367491da
Cleanup ClientStates
...
Former-commit-id: 060cf9800dc6f09c58f41a4baaccb1a43bd97621
2019-04-22 23:00:24 +02:00
timokoesters
e9027c6433
Split connecting from registering
...
Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9
2019-04-22 23:00:24 +02:00
timokoesters
9a48e2fd42
Rename ClientState Connected -> Registered, Visitor -> Connected
...
Former-commit-id: 34f6726203b7d20b42937a02f48d8920ca3f1d7a
2019-04-22 23:00:23 +02:00
timokoesters
ba6ead4077
More wrong messages will be punished with disconnect
...
Former-commit-id: 767f3226c62d7560d26a909eed8a69b8afe11110
2019-04-22 23:00:23 +02:00
timokoesters
07a2aab8a3
Rename Disconnected to Visitor
...
Former-commit-id: aeb729a933cda380c03efe346347fc4dc0648dfb
2019-04-22 23:00:23 +02:00
timokoesters
fc2e6c3624
Clean up client state code
...
Former-commit-id: 2469a49abd23038838f6176b7f5cf0b303e8bee5
2019-04-22 23:00:22 +02:00
timokoesters
794b9cafad
Implement ClientStates
...
Former-commit-id: f6167fd6de6fd1a3309224409cac77193be982e2
2019-04-22 23:00:22 +02:00
timokoesters
802c484a38
Make character model more variable
...
Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef
2019-04-22 23:00:21 +02:00
sxv20_
688ce246ec
Merge branch 'fps_counter' of https://gitlab.com/sxv20_/veloren into fps_counter
...
Former-commit-id: 771ec3a38d9d767c6ef00c3052d66d513b6f584d
2019-04-22 20:25:13 +01:00
sxv20_
ded36d7c8d
Add debug window, debug window toggle
...
Former-commit-id: f0eee8c127dab7c6f552e00ca26632fe1798ee5d
2019-04-22 20:24:54 +01:00
sxv20_
64c97f47fc
Add prototype FPS counter to HUD
...
Former-commit-id: c75778ff22ddd44d6e398a559193bc0d0c2e62fe
2019-04-22 20:24:16 +01:00
sxv20_
ded06601a2
Merge branch 'master' of https://gitlab.com/veloren/veloren into fps_counter
...
Former-commit-id: 2d509bfd24d2bb4ab804de8c91e806c50e3b701f
2019-04-22 20:19:14 +01:00
