Timo Koesters
|
d864afa1fb
|
Merge branch 'animation-fixes' into 'master'
Fix missing gliding animation
See merge request veloren/veloren!182
Former-commit-id: 636de84876a22705dec3c9c4115e1a4bf060608e
|
2019-05-26 17:42:19 +00:00 |
|
timokoesters
|
51e53cb278
|
Fix missing gliding animation
Former-commit-id: 211f285153271cad79bfdc7aa9e33608c766345d
|
2019-05-26 19:24:44 +02:00 |
|
Timo Koesters
|
daf01394ee
|
Merge branch 'hud_match' into 'master'
Fix hud handle_event() match arm order
See merge request veloren/veloren!180
Former-commit-id: bbc80c47c48239610fc8872f19d9a8ec8ca5afaf
|
2019-05-26 16:33:25 +00:00 |
|
Imbris
|
9d82e4fe7f
|
Add check for typing
Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02
|
2019-05-26 12:23:24 -04:00 |
|
Imbris
|
c2407f6659
|
Fix hud handle_event() match arm order
Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041
|
2019-05-26 12:12:10 -04:00 |
|
Timo Koesters
|
cca5682c22
|
Merge branch 'attack' into 'master'
Attack fixes
See merge request veloren/veloren!179
Former-commit-id: 97f1e109dcbcbf7f1d860cf3aebae871f93884cf
|
2019-05-26 16:07:08 +00:00 |
|
Forest Anderson
|
3393d16ce7
|
Merge branch 'nametag_fix' into 'master'
Nametag FPS Fix
See merge request veloren/veloren!178
Former-commit-id: c5846595d3c059f374862861fe40c1eb005c4c0f
|
2019-05-26 16:07:07 +00:00 |
|
timokoesters
|
0fa701b086
|
Fix invisibility
Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011
|
2019-05-26 18:01:55 +02:00 |
|
timokoesters
|
449690f38e
|
Fix wolf red and dead velocity
Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d
|
2019-05-26 17:34:00 +02:00 |
|
Imbris
|
29c41b37fc
|
Fix pet spawning leading to NaN move_dir
Former-commit-id: ac68702bfdb482f32967d96e4b1da2b0ffc4e4c4
|
2019-05-26 11:24:26 -04:00 |
|
Imbris
|
6da6ea4b1b
|
Don't create Consts if they are not needed
Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4
|
2019-05-26 11:24:26 -04:00 |
|
Imbris
|
c76eec436a
|
restore lost changes
Former-commit-id: a94c52677287131e02c88748694dfbcaf90b531a
|
2019-05-26 11:24:25 -04:00 |
|
Forest Anderson
|
79247bd225
|
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
|
bf9707c9d7
|
rebase fix
Former-commit-id: b1a1136942ec37647401dfa28682f2ee33b760a2
|
2019-05-26 11:11:14 -04:00 |
|
jshipsey
|
f5b668bd01
|
Merge branch 'pets' of https://gitlab.com/veloren/veloren into pets
Former-commit-id: f6ab802ebcb24a6c9c5d1c4343ce6b4d68cf942d
|
2019-05-26 11:04:11 -04:00 |
|
jshipsey
|
80ec0ee79b
|
rebase with combat merge
Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1
|
2019-05-26 11:02:01 -04:00 |
|
jshipsey
|
1078f756eb
|
tweaking quadrupedmedium
Former-commit-id: 61dac48095caa4c7f0fe92ff7badf360b1a1402d
|
2019-05-26 10:39:57 -04:00 |
|
jshipsey
|
c1eda9bcc0
|
pipeline adjustment
Former-commit-id: 9b263baee41e1701532aa09ed3cde51da42bd9de
|
2019-05-26 10:39:57 -04:00 |
|
jshipsey
|
2feadca75e
|
cleanup
Former-commit-id: 62237741afd6d2f6a22030a378a612c3b62dc0ae
|
2019-05-26 10:39:57 -04:00 |
|
jshipsey
|
83dd4a23ad
|
add wolf
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
|
2019-05-26 10:39:57 -04:00 |
|
Timo Koesters
|
1935240408
|
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
|
6ac3398923
|
tweaking quadrupedmedium
Former-commit-id: 3e06337cd99ced44a786c55666764a8c54bc8b90
|
2019-05-26 10:25:56 -04:00 |
|
jshipsey
|
3018c87d74
|
pipeline adjustment
Former-commit-id: 8f42b9971cb6a0f3fa9b7852fb52f4710acdcf12
|
2019-05-26 10:18:50 -04:00 |
|
timokoesters
|
ef49ef8549
|
log::error instead of panic
Former-commit-id: 802f81425869698a95654d423fef93136617cb5f
|
2019-05-26 16:11:30 +02:00 |
|
timokoesters
|
3bcf6cf4cb
|
Fix invisible chars
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
|
2019-05-26 16:04:44 +02:00 |
|
timokoesters
|
ba80eac2d3
|
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
|
6bfca9f823
|
cleanup
Former-commit-id: c4cad9ddce3d58bfb08a13959fe9bb97d44fd986
|
2019-05-26 00:43:16 -04:00 |
|
jshipsey
|
092f389104
|
add wolf
Former-commit-id: 49fee3e5056377966068bd690333f83192d1fd41
|
2019-05-25 23:31:49 -04:00 |
|
timokoesters
|
1d78c3c0be
|
Fix nametags showing on dead players (maybe)
Former-commit-id: 94548e131ee7c94fc5546fa7410fc9694d1db68e
|
2019-05-26 00:34:24 +02:00 |
|
timokoesters
|
f3c4517f85
|
TODO comment for pet fix
Former-commit-id: 747b926a92506887bb235e9e64e2c4f286d8b31b
|
2019-05-26 00:08:54 +02:00 |
|
timokoesters
|
fde98b6df2
|
Fix chat-cli
Former-commit-id: 8a6aad2dd199859d4e0731ecd766cef71fd14285
|
2019-05-26 00:06:12 +02:00 |
|
timokoesters
|
aa69585fe5
|
Fix glider
Former-commit-id: dbcdfef19b3cd428736e77176a958f128b7fe7ad
|
2019-05-26 00:04:40 +02:00 |
|
timokoesters
|
7a3943ccd2
|
Fixes
Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578
|
2019-05-26 00:00:38 +02:00 |
|
timokoesters
|
a920d9e072
|
Add better inputs, input validation and more
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
|
2019-05-25 23:46:56 +02:00 |
|
timokoesters
|
2734be1607
|
Make key binds work with mouse events
Former-commit-id: 77421b44e92d7c60c39ebcb3f94a406ef7f027ff
|
2019-05-25 23:46:52 +02:00 |
|
timokoesters
|
bd6b1df641
|
Use type MouseButton instead of glutin::MouseButton
Former-commit-id: 7fc8b2f3f42ed45455feaa4a36e225a981b768ac
|
2019-05-25 23:21:40 +02:00 |
|
timokoesters
|
71a394ae4f
|
Fix clear_terrain not changing Changes
Former-commit-id: da7b02939d6d0bc7dbef7d923fb880081f6e08aa
|
2019-05-25 23:21:40 +02:00 |
|
timokoesters
|
dd8a31d2a6
|
Add Constant for damage fade
Former-commit-id: 4b0e2ff6249ebcf814b036ba11c57ad094811e30
|
2019-05-25 23:21:40 +02:00 |
|
timokoesters
|
56dccc7708
|
More comments
Former-commit-id: 762d6437fa341a33ee80088e2c5dbbdf96387df0
|
2019-05-25 23:21:40 +02:00 |
|
timokoesters
|
88dedcd269
|
Better formatting
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
|
2019-05-25 23:21:39 +02:00 |
|
timokoesters
|
12bb678e7a
|
Change client_state_pending to ClientState::Pending
Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7
|
2019-05-25 23:21:39 +02:00 |
|
timokoesters
|
ab719fcf43
|
Fix respawn position
Former-commit-id: c4dabc71a1c7af538e2c30acbf463340a4618cc9
|
2019-05-25 23:21:39 +02:00 |
|
timokoesters
|
2678e9c0c3
|
Implement fast respawn
Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd
|
2019-05-25 23:21:39 +02:00 |
|
timokoesters
|
8fcb72918e
|
Implement hit time delay
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
|
2019-05-25 23:21:39 +02:00 |
|
timokoesters
|
d59d9fbfab
|
Limit attack direction
Former-commit-id: b132f01f86814d2f8dd10d6d1454b6e2a95595f8
|
2019-05-25 23:21:39 +02:00 |
|
timokoesters
|
9bf5023d4c
|
Fix chunk loading delay
Former-commit-id: b287ab5be22ae6e4d0b10b5010e592a7a514cacb
|
2019-05-25 23:21:39 +02:00 |
|
timokoesters
|
af4db5b405
|
Fix terrain not loading
Former-commit-id: f9279878ab051c6083c4a1f5125531fe79151fb8
|
2019-05-25 23:21:39 +02:00 |
|
timokoesters
|
7f0ac45496
|
Fix client states server-side
Former-commit-id: 701dd2a7f53bd0f1943cbeb61cc9c251228a4b5f
|
2019-05-25 23:21:38 +02:00 |
|
timokoesters
|
37638a45f9
|
Add /kill command for easier testing
Former-commit-id: 9f27dcfd5c99327fdc6e30cac30afa5cc75cec95
|
2019-05-25 23:21:38 +02:00 |
|
timokoesters
|
cc0c05b7dc
|
Remove all outdated components when dieing
Former-commit-id: 9f320fba441998af24bf52be92260264f183f0d8
|
2019-05-25 23:21:38 +02:00 |
|