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
Forest Anderson
836e6245ee
Merge branch 'fix-license' into 'master'
...
Fix license repo name
Closes #50
See merge request veloren/veloren!62
Former-commit-id: 6d1c1b3a947e056f22456d23bb76a7ddfee0e2e6
2019-04-22 19:05:05 +00:00
timokoesters
7061a6b8a2
Fix license repo name
...
Former-commit-id: 2422114d303a334db84ed3afe5626bc7d5e38c4e
2019-04-22 20:32:40 +02:00
Joshua Barretto
b6d785f401
Merge branch 'master' into 'master'
...
Assorted tweaks
See merge request veloren/veloren!59
Former-commit-id: dc90c1e6926cfad8bcd824b8ff6487aafe38dca7
2019-04-22 16:52:25 +00:00
Joshua Barretto
779d50b6de
Fixed clock
...
Former-commit-id: 585000319073e06f6511b3ef2c3db1135167d9d4
2019-04-22 17:50:18 +01:00
Joshua Barretto
247ba6621a
Made NPC movement smoother
...
Former-commit-id: 105908cf0118113408acd5ad7dce191fe405f88f
2019-04-22 17:50:18 +01:00
Joshua Barretto
1df7d0080f
Merge branch 'fix-internal' into 'master'
...
Remove .internal and .internal_mut
See merge request veloren/veloren!60
Former-commit-id: c68636dccaf845a90c591390b368c0c63678f72c
2019-04-22 15:36:30 +00:00
timokoesters
799046f5f0
Update Cargo.lock
...
Former-commit-id: 1d8a788d67c6e55056f58bc55bf9de6d993b68e8
2019-04-22 17:25:34 +02:00
timokoesters
91057edfac
Remove .internal and .internal_mut
...
Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2
2019-04-22 10:24:27 +02:00
Joshua Barretto
0dca245a53
Merge branch 'master' into 'master'
...
animation tweaks
See merge request veloren/veloren!57
Former-commit-id: 070d47b4b3488a447523769169811cf25fb7a04b
2019-04-20 23:43:34 +00:00
jshipsey
44374969fb
Merge branch 'master' of https://gitlab.com/jshipsey/fresh
...
Former-commit-id: ba8dfe2c6b54b40b25ce2fe71d2eef8827f8a779
2019-04-20 19:39:54 -04:00
jshipsey
c492e72a99
tidying up code
...
Former-commit-id: 0f77e7baf0c628969bc31e4d5fc4b42e18ab57d2
2019-04-20 19:37:09 -04:00
jshipsey
7778546b69
more rebasing
...
Former-commit-id: f8671bbddd1c8aae132f1888bb76262aa5f81bcf
2019-04-20 19:34:40 -04:00
jshipsey
0e71756643
merge fix
...
Former-commit-id: 38fa38de2b2985062e3260170b4f6f06d17515a1
2019-04-20 19:28:18 -04:00
jshipsey
a7f300feee
rebasing
...
Former-commit-id: 1ef4423a8f839f5c72c650dd0ba4affddc0215fa
2019-04-20 19:28:18 -04:00
jshipsey
9d2040d509
tidying up code
...
Former-commit-id: 43981525316728a182d41ecc107f31e2eb2583f9
2019-04-20 19:20:49 -04:00
jshipsey
6fd783e6eb
animation minor fixes
...
Former-commit-id: 38d2da587d647b7f0c08994bc9fe41cc2d7ab675
2019-04-20 19:20:48 -04:00
jshipsey
0137a83dd8
animattion tweaks
...
Former-commit-id: ea560ba0f06432d2d4f9d4f1906f77451a7f5ef7
2019-04-20 19:18:42 -04:00
jshipsey
78d7cfd89d
animation adjustments
...
Former-commit-id: d396ddadf4293212f9f6f7142de0d8a519e127d6
2019-04-20 19:18:42 -04:00
jshipsey
33411a6004
merge fix
...
Former-commit-id: 15da549d36774bb3713297d2b9f3799b1d7eb5f4
2019-04-20 19:13:38 -04:00
jshipsey
ab17221dad
adding test assets
...
Former-commit-id: 7d8f9b19d8ec1b31a67d3d650a9e64aa23fc741c
2019-04-20 19:13:38 -04:00
jshipsey
a04ddf67f6
quadruped testing
...
Former-commit-id: 07f4fb4484f26dae0e8503ddec32a17f2fa312b5
2019-04-20 19:13:38 -04:00
Joshua Barretto
0e812baf7f
Merge branch 'ui_improvements' into 'master'
...
Ui improvements
Closes #23
See merge request veloren/veloren!54
Former-commit-id: 227b25c971c2576e5121d884a5e102307dd471c3
2019-04-20 23:06:59 +00:00
jshipsey
357a035757
Merge branch 'master' of https://gitlab.com/jshipsey/fresh
...
Former-commit-id: 0b7dab49b7d7d92149b2873a8390ab699db63642
2019-04-20 18:57:09 -04:00
jshipsey
83f8759746
tidying up code
...
Former-commit-id: 062930589922dc903be9e959eb06fd203945c101
2019-04-20 18:52:34 -04:00
jshipsey
30e80bdfc3
animattion tweaks
...
Former-commit-id: 8e1b89a929761fee2a46aab4689a3dee72573eff
2019-04-20 18:47:46 -04:00
jshipsey
7717d12c7a
more rebasing
...
Former-commit-id: c38dde30d5ced7cefad40e3f4ae4208f412bdd23
2019-04-20 18:47:15 -04:00
jshipsey
c655790c8a
merge fix
...
Former-commit-id: a344856978c40e12d37dba5aaa0e0abac1dba9f4
2019-04-20 18:41:05 -04:00
jshipsey
164b9ee203
adding test assets
...
Former-commit-id: 9731a05a8b4bed89898513599f8689be5600bb0b
2019-04-20 18:41:05 -04:00
jshipsey
ee4a261a28
rebasing
...
Former-commit-id: 38e7f49fb503caa9ca2377ac48f8fb3a1b22301e
2019-04-20 18:37:09 -04:00
jshipsey
3d318a85e4
tidying up code
...
Former-commit-id: df86599ae47b71bb744f5589da4511fa71603541
2019-04-20 18:12:45 -04:00
jshipsey
46f571f99a
animation minor fixes
...
Former-commit-id: 4326db41103a0d3f87c7ad638fb38cd2f3eec71c
2019-04-20 18:08:56 -04:00
