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
0bb35fe232
Update assets
...
Former-commit-id: c3692838320a5da02525d9675de3f55249a39100
2019-04-25 10:50:56 +02:00
2a6a0a2a3e
Fix default server loading
...
Former-commit-id: 2273a32327c5268e4f6d5cce97bd58792a385c71
2019-04-25 02:45:01 -06:00
feb0610448
Ran rustfmt on ui.rs
...
Former-commit-id: 7ee721023ce69de122993b9c94b0bd3fa739e154
2019-04-25 02:35:08 -06:00
d7e9caf5de
Adjust server list UI
...
Former-commit-id: 61587cbd540c71bc9c264a744b89b8d88ec7ac15
2019-04-25 02:35:08 -06:00
dadbfb9d85
Add clickable server buttons
...
Former-commit-id: d56b65b83db590991a2a42a95caa7b41a216052c
2019-04-25 02:35:08 -06:00
d7c80d0afc
Add basic UI to view saved servers
...
Former-commit-id: 85cc946ac3684aaba64a03997790ef5ab06dbbd7
2019-04-25 02:35:08 -06:00
15c2cdb2ef
Add networksettings and integrate with main menu ui
...
Former-commit-id: f04532e03f8262b9751ae4a68259637f7de0344c
2019-04-25 02:35:08 -06:00
e36ca0bc59
Fix unnecessary if
...
Former-commit-id: 303b140a06045a7eb3406402d5e30480571a713d
2019-04-25 10:27:18 +02:00
b9725aa4b1
Merge branch 'master' of https://gitlab.com/jshipsey/fresh
...
Former-commit-id: d0e5a6e3c337cbe0907664a94782959bf588c566
2019-04-24 23:38:50 -04:00
c0a8a677b7
simplified scaling code
...
Former-commit-id: 9e35a57ea812f1446958daac2ccd4c3492d19347
2019-04-24 23:33:36 -04:00
0a34bfab9b
run animation incremental tweaks
...
Former-commit-id: fa43d89890e22da665dc29606baed46e23f8eb6e
2019-04-24 23:32:35 -04:00
bc5074a2b8
velocity tilt
...
Former-commit-id: 362232bff35784828ee8766e77dadc4e83bf3753
2019-04-24 23:31:18 -04:00
56a8a247cc
simplified scaling code
...
Former-commit-id: 2a1c8450f002862f67873c375674413902e138ef
2019-04-24 23:30:06 -04:00
9c15fa08a8
run animation incremental tweaks
...
Former-commit-id: 3abad8762a7a2daaf96c955cf89bcf5713ae7318
2019-04-24 23:28:51 -04:00
9510edd148
velocity tilt
...
Former-commit-id: 34443765d993ec5036d2b3e08e7dff5a68193de6
2019-04-24 23:26:22 -04:00
97603120a2
simplified scaling code
...
Former-commit-id: 3f85bf6aef1f3931570fafb8b2aa5b0dc26f8fad
2019-04-24 23:25:05 -04:00
4d0660affb
run animation incremental tweaks
...
Former-commit-id: c80f014baf3b9ddb73bb01cf6fd83272d890ab55
2019-04-24 23:25:05 -04:00
df39bcb2dc
velocity tilt
...
Former-commit-id: 7373827734c9a65813537d7a1cb49b400c7d6fb8
2019-04-24 23:25:05 -04:00
a981d57379
Fix formatting
...
Former-commit-id: 5fd593a918f22d02b2c5be246c81ef1e8042ad69
2019-04-24 22:33:34 +02:00
8314fc9439
Update UI
...
Former-commit-id: 644483e15f2d4db6ab2400ffe4fb202729769217
2019-04-24 21:55:22 +02:00
d7dbda7876
Changed directory
...
Former-commit-id: d5c572f26bbed5c6c0afc043f106e849fdef401c
2019-04-24 15:20:48 -04:00
944bbdbecc
Removed current folder parameter
...
Former-commit-id: 507c856d9e06a74e8e8241091deb49439012c300
2019-04-24 15:13:03 -04:00
5ac49c15a3
Cleaned, other work
...
Former-commit-id: 5f76fa944db9bdaaaab14da628db36d82f3d4d5c
2019-04-24 14:47:03 -04:00
2fdd7fca32
Uncommented lots of the tasks
...
Former-commit-id: 21bc41fbcfe580c0465a0cfd0053569a1b59186f
2019-04-24 11:10:12 -04:00
3231541b3e
Remove alternate git pull script
...
Former-commit-id: d86577109ade759c86fc97b51b32803457382a80
2019-04-24 09:59:27 -04:00
fdd92fb5ac
Changed submodule update
...
Former-commit-id: 2d1ed2cb59065760d8338d8620cc94cb610dc01b
2019-04-24 09:49:38 -04:00
f6b7ebf847
Sync for checkout
...
Former-commit-id: 00aa003a897612a47b020a18270f5a4225b3d027
2019-04-24 09:44:34 -04:00
d0d3f2e9b8
Added image to clean code
...
Former-commit-id: 5f33b098b0f086d9ccf77acd028463027ef58482
2019-04-24 09:39:30 -04:00
303b3eb906
First try with new image
...
Former-commit-id: 0642ae8965a5f410445c62c9408059bf010986b8
2019-04-24 09:37:36 -04:00
eb1c6d623e
Change target location
...
Former-commit-id: 9726ae44e7c0c72db648ef2aad08784f115a48cb
2019-04-24 08:17:02 -04:00
a385e2a25d
Save target to cache
...
Former-commit-id: ddf1488dca4917e5cfae55002e0763dfbee1ad91
2019-04-24 08:06:26 -04:00
d51594006c
simplified scaling code
...
Former-commit-id: 20bf8a426f9fc1fad523ed41688e3d419037a4a6
2019-04-23 20:36:33 -04:00
af194d2e28
run animation incremental tweaks
...
Former-commit-id: f8800cad3d50eb3c536a1673bbe216b3098ce81e
2019-04-23 20:17:50 -04:00
0ee552cb5a
Fixed before_script
...
Former-commit-id: ef3bd010fe8bdd8bbb4e9159e11109d5db42dce0
2019-04-23 14:48:03 -04:00
66a6db7add
Added before script submodule
...
Former-commit-id: fa51f02b4ff4d1e5f671363fc3978065fe8c9970
2019-04-23 14:38:54 -04:00
efe365c990
Added submodule properly
...
Former-commit-id: 7773a1ec2d670043cc26c6b154d2b848c15ebc2b
2019-04-23 14:08:34 -04:00
91223ef41a
Added gcc
...
Former-commit-id: d8dc7ac7a7a133f261531544010d9554c3b41b0e
2019-04-23 14:02:08 -04:00
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
a580d46820
Fixed source
...
Former-commit-id: 192c67bba4180fcf39e4e9c48b0a85323600f18c
2019-04-23 13:44:00 -04:00
af250ce03a
Added curl
...
Former-commit-id: 68bc6cb4acf734acf4b0e6ef5e8d5900e5e5f35a
2019-04-23 13:42:40 -04:00
7840519ba9
Basic Rust env
...
Former-commit-id: 563aa620deb71fce91de02c91595044da108ff90
2019-04-23 13:41:40 -04:00
0127cae5d0
remove TODO comment
...
Former-commit-id: cd90cd0403d03b6c8c9477a7377ad25288cc1488
2019-04-23 18:36:29 +01:00
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
5cb368dddc
Fix chat-cli not compiling
...
Former-commit-id: b69c0e8208374af3eef0d996137a5e7ebbfe9a16
2019-04-23 14:28:45 +02:00
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
701755a8e2
Add disconnect handling
...
Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f
2019-04-23 14:01:16 +02:00
7baecff1f0
Clean up figure cache models when necessary
...
Former-commit-id: 7653217b2f4c02f5c179e35907fa47c3526b2a2e
2019-04-23 13:59:16 +02:00
df7a145bbc
Better formatting
...
Former-commit-id: 4316514f4f58dca8ed21dae00fad7a6df36b9ff1
2019-04-23 12:12:22 +02:00
7fc2b3490c
Answer with WrongMessage when trying to RequestState Connected
...
Former-commit-id: 8384caae9f19d05f174457ab8efc6046ce30bd8c
2019-04-23 11:14:35 +02:00
