Imbris
3c7f463330
Don't create Consts if they are not needed
...
Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4
2019-05-26 11:24:26 -04:00
Imbris
4a8e85ef64
restore lost changes
...
Former-commit-id: a94c52677287131e02c88748694dfbcaf90b531a
2019-05-26 11:24:25 -04:00
Forest Anderson
3ad8f49f7f
Merge branch 'pets' into 'master'
...
Pets
See merge request veloren/veloren!177
Former-commit-id: 06a160658c2d2688543e65e502f3419016c9a277
2019-05-26 15:19:56 +00:00
jshipsey
d179ccbd92
rebase fix
...
Former-commit-id: b1a1136942ec37647401dfa28682f2ee33b760a2
2019-05-26 11:11:14 -04:00
jshipsey
b4e9359e3f
Merge branch 'pets' of https://gitlab.com/veloren/veloren into pets
...
Former-commit-id: f6ab802ebcb24a6c9c5d1c4343ce6b4d68cf942d
2019-05-26 11:04:11 -04:00
jshipsey
7aab509701
rebase with combat merge
...
Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1
2019-05-26 11:02:01 -04:00
jshipsey
c342a7136b
tweaking quadrupedmedium
...
Former-commit-id: 61dac48095caa4c7f0fe92ff7badf360b1a1402d
2019-05-26 10:39:57 -04:00
jshipsey
cd4e36e32a
pipeline adjustment
...
Former-commit-id: 9b263baee41e1701532aa09ed3cde51da42bd9de
2019-05-26 10:39:57 -04:00
jshipsey
51b54a0252
cleanup
...
Former-commit-id: 62237741afd6d2f6a22030a378a612c3b62dc0ae
2019-05-26 10:39:57 -04:00
jshipsey
26da091b0b
add wolf
...
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
2019-05-26 10:39:57 -04:00
Timo Koesters
dc7f1fe7aa
Merge branch 'attack' into 'master'
...
Combat
Closes #59
See merge request veloren/veloren!153
Former-commit-id: c0c4583d162470b93beec31baf18b2f5999503ee
2019-05-26 14:31:05 +00:00
jshipsey
fa07323083
tweaking quadrupedmedium
...
Former-commit-id: 3e06337cd99ced44a786c55666764a8c54bc8b90
2019-05-26 10:25:56 -04:00
jshipsey
9a4e663ef9
pipeline adjustment
...
Former-commit-id: 8f42b9971cb6a0f3fa9b7852fb52f4710acdcf12
2019-05-26 10:18:50 -04:00
timokoesters
f0397f1a32
log::error instead of panic
...
Former-commit-id: 802f81425869698a95654d423fef93136617cb5f
2019-05-26 16:11:30 +02:00
timokoesters
64b00f41f4
Fix invisible chars
...
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
2019-05-26 16:04:44 +02:00
timokoesters
cda253c3cf
Make Failed to tick go back to the main screen and move to ron
...
Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
2019-05-26 12:58:43 +02:00
jshipsey
eddffb9d91
cleanup
...
Former-commit-id: c4cad9ddce3d58bfb08a13959fe9bb97d44fd986
2019-05-26 00:43:16 -04:00
jshipsey
b7cbe1e67c
add wolf
...
Former-commit-id: 49fee3e5056377966068bd690333f83192d1fd41
2019-05-25 23:31:49 -04:00
timokoesters
a18a8e0d15
Fix nametags showing on dead players (maybe)
...
Former-commit-id: 94548e131ee7c94fc5546fa7410fc9694d1db68e
2019-05-26 00:34:24 +02:00
timokoesters
148c015b38
TODO comment for pet fix
...
Former-commit-id: 747b926a92506887bb235e9e64e2c4f286d8b31b
2019-05-26 00:08:54 +02:00
timokoesters
d7d8888778
Fix chat-cli
...
Former-commit-id: 8a6aad2dd199859d4e0731ecd766cef71fd14285
2019-05-26 00:06:12 +02:00
timokoesters
79a0edad85
Fix glider
...
Former-commit-id: dbcdfef19b3cd428736e77176a958f128b7fe7ad
2019-05-26 00:04:40 +02:00
timokoesters
746e286b5b
Fixes
...
Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578
2019-05-26 00:00:38 +02:00
timokoesters
4696cd2c8b
Add better inputs, input validation and more
...
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
2019-05-25 23:46:56 +02:00
timokoesters
3c0121538b
Make key binds work with mouse events
...
Former-commit-id: 77421b44e92d7c60c39ebcb3f94a406ef7f027ff
2019-05-25 23:46:52 +02:00
timokoesters
075c0d9e11
Use type MouseButton instead of glutin::MouseButton
...
Former-commit-id: 7fc8b2f3f42ed45455feaa4a36e225a981b768ac
2019-05-25 23:21:40 +02:00
timokoesters
f4434013db
Fix clear_terrain not changing Changes
...
Former-commit-id: da7b02939d6d0bc7dbef7d923fb880081f6e08aa
2019-05-25 23:21:40 +02:00
timokoesters
525af4c201
Add Constant for damage fade
...
Former-commit-id: 4b0e2ff6249ebcf814b036ba11c57ad094811e30
2019-05-25 23:21:40 +02:00
timokoesters
73f29e3716
More comments
...
Former-commit-id: 762d6437fa341a33ee80088e2c5dbbdf96387df0
2019-05-25 23:21:40 +02:00
timokoesters
15d1a789d6
Better formatting
...
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
2019-05-25 23:21:39 +02:00
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
