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
15,337 Commits 151 Branches 18 Tags 2.1 GiB
8abffa6dca
Commit Graph

15337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
sxv20_
1d2e727dbf Add debug window, debug window toggle 
Former-commit-id: b6db90d082b11de00a229e76a949af5a54c4871b
 2019-04-22 19:47:22 +01:00
timokoesters
7061a6b8a2 Fix license repo name 
Former-commit-id: 2422114d303a334db84ed3afe5626bc7d5e38c4e
 2019-04-22 20:32:40 +02:00
timokoesters
f8d1340199 Show mouse on Esc, hide when pressing again 
Former-commit-id: 440fd99b32b2490cb87add2e095cdd17fece0b57
 2019-04-22 20:23:40 +02:00
sxv20_
cab9e451f4 Merge branch 'master' of https://gitlab.com/veloren/veloren into fps_counter 
Former-commit-id: 2799b8581e6733fba16ef44f6c9ab79233273d50
 2019-04-22 17:56:37 +01: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
sxv20_
0e8a7ecda3 pull from upstream 
Former-commit-id: 7907655bdc290e4790034d516d71839c3b45ec6c
 2019-04-22 17:41:07 +01:00
sxv20_
c49a88455a Add prototype FPS counter to HUD 
Former-commit-id: 77e22998b71a6d3932271a6b9e815dab3925d5e3
 2019-04-22 17:16:21 +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
jshipsey
c94e210954 velocity tilt 
Former-commit-id: 73368363ba89a42a8867a593d88d108e05e713f8
 2019-04-21 13:35:43 -04: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