timokoesters
3697c47e33
Change client_state_pending to ClientState::Pending
...
Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7
2019-05-25 23:21:39 +02:00
timokoesters
1dbca8b994
Fix respawn position
...
Former-commit-id: c4dabc71a1c7af538e2c30acbf463340a4618cc9
2019-05-25 23:21:39 +02:00
timokoesters
1826a2b4f9
Implement fast respawn
...
Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd
2019-05-25 23:21:39 +02:00
timokoesters
0344f3eba8
Implement hit time delay
...
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
2019-05-25 23:21:39 +02:00
timokoesters
ad3b8dffa1
Limit attack direction
...
Former-commit-id: b132f01f86814d2f8dd10d6d1454b6e2a95595f8
2019-05-25 23:21:39 +02:00
timokoesters
e34a47d0d7
Fix chunk loading delay
...
Former-commit-id: b287ab5be22ae6e4d0b10b5010e592a7a514cacb
2019-05-25 23:21:39 +02:00
timokoesters
f5751d65b1
Fix terrain not loading
...
Former-commit-id: f9279878ab051c6083c4a1f5125531fe79151fb8
2019-05-25 23:21:39 +02:00
timokoesters
36e890bbd8
Fix client states server-side
...
Former-commit-id: 701dd2a7f53bd0f1943cbeb61cc9c251228a4b5f
2019-05-25 23:21:38 +02:00
timokoesters
616b922e36
Add /kill command for easier testing
...
Former-commit-id: 9f27dcfd5c99327fdc6e30cac30afa5cc75cec95
2019-05-25 23:21:38 +02:00
timokoesters
69cd712ca9
Remove all outdated components when dieing
...
Former-commit-id: 9f320fba441998af24bf52be92260264f183f0d8
2019-05-25 23:21:38 +02:00
timokoesters
30bf1cde10
Add knockback
...
Former-commit-id: a703eb937ef7094a085548ca3197a575059855a0
2019-05-25 23:21:38 +02:00
timokoesters
a0918d11b6
Fix red effect
...
Former-commit-id: 1fd90a40aaaccb98aeb34715ee7cad5c0b3b3de7
2019-05-25 23:21:38 +02:00
timokoesters
ad5dcb4158
Make use of states in char-selection
...
Former-commit-id: f74d4811bebb0e60093a96d70feeedaae8bc6c04
2019-05-25 23:21:38 +02:00
timokoesters
7d683affe9
Use clients.notify()
...
Former-commit-id: 3921579a91033cbdf85929e172fc987a26fdcc9c
2019-05-25 23:21:38 +02:00
timokoesters
fc39356cde
Use correct time
...
Former-commit-id: df33e802ee46f9ebe190be705ff8d81f856024e0
2019-05-25 23:21:38 +02:00
timokoesters
449b717777
Go back to char selection on death
...
Former-commit-id: a8b5ee42f432ff2da8385225b17be654420f17d1
2019-05-25 23:21:37 +02:00
timokoesters
b26f00ddfb
Fix pvp
...
Former-commit-id: 98480aa29c882b0bf92364b39a8284355647956b
2019-05-25 23:21:37 +02:00
timokoesters
8af3ca5317
Fix animations
...
Former-commit-id: 20285b42be6f1858105cc4287e357ea254a8ce35
2019-05-25 23:21:37 +02:00
timokoesters
b3e4ca0a5d
Implement killing
...
Change animation history to animation
Add attack input event
Implement killing with ecs systems for damage and death
Sync attack properly
Sync deaths
Former-commit-id: 72b5be7d65d9d3fcbef50d4836a6f06ec218d69e
2019-05-25 23:21:37 +02:00
Imbris
3ddf4bddab
Merge branch 'chat-limit' into 'master'
...
Limited total messages
See merge request veloren/veloren!176
Former-commit-id: 74000e7cec193056ce9215666668aac32b347487
2019-05-25 20:15:02 +00:00
Joshua Barretto
242a23658c
Switched to pop_front
...
Former-commit-id: 2653d3bb0fc5e9dd9c50eeb7b012d3cd4e94b439
2019-05-25 21:03:56 +01:00
Joshua Barretto
3534804697
Limited total messages
...
Former-commit-id: 7c8e4a3f9e1d36731579300f7662a324566de6fb
2019-05-25 20:16:38 +01:00
Imbris
ad2fadf8bc
Merge branch 'fixes_and_tweaks' into 'master'
...
Fixes and tweaks
Closes #104
See merge request veloren/veloren!175
Former-commit-id: a0dee8b70c9b2a0dffa287d1fda371b0f216287a
2019-05-25 14:05:10 +00:00
Imbris
9edcabc679
Fix difficult grabbing after closing via button
...
Former-commit-id: 2649d9e210d375f19d2970f15614be23d5173c67
2019-05-25 08:59:58 -04:00
Imbris
3daec2cb17
Don't take mouse events from an unfocused window
...
Former-commit-id: 99b60171c86109606318c6f39b45370105e3a7d9
2019-05-25 08:59:58 -04:00
Imbris
a09c3691db
add pan and zoom sensitivity settings
...
Former-commit-id: 26d2becc17cc3b9fce77e27f91834b0caf3ea77a
2019-05-25 08:59:58 -04:00
Imbris
25dbc54961
set player alias as nametag if default char name
...
Former-commit-id: 0c6053842028b2b2743746267bb65a34a6581d71
2019-05-25 08:59:57 -04:00
Joshua Barretto
c536bfb511
Merge branch 'worldgen-structures' into 'master'
...
Worldgen structures
See merge request veloren/veloren!161
Former-commit-id: 0c11ec40ce5ec06e6ce98e33a2a304f8818f8270
2019-05-25 08:45:19 +00:00
Joshua Barretto
0bb217d53f
Added docs to assets::load_map
...
Former-commit-id: 50397d3c5d8c30ea392b784d9309d0e2ecb28f73
2019-05-25 09:38:30 +01:00
Joshua Barretto
8348633a0f
Stopped trees spawning in water
...
Former-commit-id: 1cc73b0eea4126da4501e19a695b572efc436935
2019-05-25 08:36:11 +01:00
Joshua Barretto
62f3808f5a
Fixed world viewer
...
Former-commit-id: 03113582d1bd9bce6848c66b9c73a2ba2939162e
2019-05-25 07:00:24 +01:00
Joshua Barretto
92391883a9
fmt
...
Former-commit-id: 689464ed1009ebfd74769fa113fc7b433ea62bbd
2019-05-25 06:54:47 +01:00
Joshua Barretto
16b80ab006
Marginally increased tree spawn frequency
...
Former-commit-id: c23a172e4796317bafdf4a6661330ed86d4eb248
2019-05-25 06:49:55 +01:00
Joshua Barretto
e0aaa96262
Improved grass and tree colour
...
Former-commit-id: 9372612047df95ec9588d35a32161248df85178a
2019-05-25 06:47:11 +01:00
Joshua Barretto
2f376509a3
Better spawn point
...
Former-commit-id: 31b4df016aea512494d419515043baa288fa9ab5
2019-05-25 06:42:26 +01:00
Joshua Barretto
c919f6fc83
Better tree spawning, more trees
...
Former-commit-id: abf4ff8a2eb005c2cd1832f5a3ae7182c4fc31f6
2019-05-25 06:38:40 +01:00
Joshua Barretto
9ed330d8fe
Improved sea-like slopes
...
Former-commit-id: 4b3ba56dcf6d99db7e48c169d42e042811872fd3
2019-05-25 05:51:45 +01:00
Joshua Barretto
1551bf0ae6
Much bigger terrain
...
Former-commit-id: f83f281a1ec1d18079a574580d5d963416fccde2
2019-05-25 05:51:45 +01:00
Joshua Barretto
842f518535
Made mountains bigger
...
Former-commit-id: c6ef0a8dba599e70177c7446fe282f357d33a66b
2019-05-25 05:51:45 +01:00
Joshua Barretto
c8ba5d9f89
Basic pine tree spawning
...
Former-commit-id: e58374724f6c9cb4a54ae96abd3420b02207fd30
2019-05-25 05:51:45 +01:00
Joshua Barretto
4d73f38e6d
Refactored worldgen sampling, added cache layer
...
Former-commit-id: 3ad5277ed0c871d6678a42629145cb722d4c76c5
2019-05-25 05:51:45 +01:00
Joshua Barretto
857315a27d
Added basic structure generation
...
Former-commit-id: 88a6bf2e18ac4f8f9b560797c8aac82ca318afb0
2019-05-25 05:51:45 +01:00
Joshua Barretto
79ae6f10e7
Changed snow altitude
...
Former-commit-id: 0a673564d854e535574381874127254e83f92585
2019-05-25 05:51:45 +01:00
Joshua Barretto
bab4cbb782
Adjusted snow
...
Former-commit-id: d30f3f8bb4e59c436023ccb38f65e868935d62f0
2019-05-25 05:51:45 +01:00
Joshua Barretto
31e25e8b09
Made mountain rock darker
...
Former-commit-id: 2da60a1e6b69d2522773ee3aae5cf2d83a1d0396
2019-05-25 05:51:45 +01:00
Joshua Barretto
86bb277116
Added snow to mountains, fixed hash sub-chunk allocation failure
...
Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120
2019-05-25 05:51:45 +01:00
Joshua Barretto
cafbb45e52
Small worldgen fixes and hash chunk optimisation
...
Former-commit-id: f1cb9a010f5d0882d4bc21ede1f405a8a7fa867c
2019-05-25 05:51:45 +01:00
Joshua Barretto
611b270ded
Improved cache-coherency of world chunk interpolation
...
Former-commit-id: 2f45cf47916970185c65c701dfc63ae838f05734
2019-05-25 05:51:45 +01:00
Forest Anderson
0ef1c0084c
Merge branch 'adding-combat-anims' into 'master'
...
Combat animation groundwork
See merge request veloren/veloren!174
Former-commit-id: 7fd5356a9fab76184e2726e96154d975c5855458
2019-05-24 23:36:19 +00:00
jshipsey
e84d19b5c8
fmt
...
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
2019-05-24 19:01:10 -04:00
