timokoesters
c96b5c45c3
Fix attack delay
...
Former-commit-id: 28f7a492adcc37cec15e3e3c0d46b6015b27ee04
2019-05-28 21:11:29 +02:00
Forest Anderson
2fc4e9a2f8
Merge branch 'enemies' into 'master'
...
Enemies
See merge request veloren/veloren!186
Former-commit-id: f920608508868119aad286cbe45599342dc1942b
2019-05-28 19:08:02 +00:00
Joshua Barretto
e53cd7a15a
Merge branch 'fix-moving' into 'master'
...
Fix moving after death (again)
See merge request veloren/veloren!192
Former-commit-id: a8390094833976a009af7a1e044ff6ee9e10c4ff
2019-05-28 19:01:30 +00:00
Joshua Barretto
8407908af2
fmt
...
Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23
2019-05-28 19:59:32 +01:00
Forest Anderson
f5d42cba21
Merge branch 'debug-coordinates' into 'master'
...
Add player coordinates to debug window
Closes #129
See merge request veloren/veloren!193
Former-commit-id: 51cfaee7dcff37ccf83f2386441e0e1364134ad7
2019-05-28 18:32:38 +00:00
JMS
4fcb6cd025
Add player coordinates to debug window
...
Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7
2019-05-28 14:23:24 -04:00
timokoesters
5c48330460
Fix moving after death (again)
...
Former-commit-id: 1c46fed1f5d9a74bcf926354b3b4efd442f5b5bc
2019-05-28 18:37:49 +02:00
Marcel
b5b61462ee
Merge branch 'event-chat-messages' into 'master'
...
Event chat messages
See merge request veloren/veloren!188
Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7
2019-05-28 10:45:24 +00:00
Marcel
7cbc4dbfdb
Merge branch 'easy-run' into 'master'
...
Add default-run to allow compiling with just `cargo run`
See merge request veloren/veloren!189
Former-commit-id: e520b72762accce00e275a48d70bbec31f2dbd83
2019-05-28 10:27:45 +00:00
Marcel
8c3b69eb81
Merge branch 'swing-animation' into 'master'
...
Swing animation
See merge request veloren/veloren!191
Former-commit-id: da4296c0d311bd7a3b17c45b86cf61858ccb2f53
2019-05-28 10:26:48 +00:00
jshipsey
6cb1a75b93
speed tweak
...
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
2019-05-27 19:48:44 -04:00
Joshua Barretto
bfc70f4d78
Sort of fixed enemy freezes
...
Former-commit-id: 30933b3ff7d16428a107ade6163cb83562668b66
2019-05-28 00:04:25 +01:00
jshipsey
f9e2828de5
swing animation changes
...
Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd
2019-05-27 19:03:52 -04:00
jshipsey
5f22c4e26f
swing animation
...
Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c
2019-05-27 18:54:09 -04:00
Joshua Barretto
7582714edc
Merge branch 'fix-singleplayer-crash' into 'master'
...
Fix singleplayer crash
See merge request veloren/veloren!190
Former-commit-id: 30449fdaba01d5c5bc92344a0706dfbbdccb2c0f
2019-05-27 22:14:58 +00:00
timokoesters
2fc82dcf5e
Fix singleplayer crash
...
Former-commit-id: afbcdfe2024befbd5a225db049ce2f9a761e6df6
2019-05-28 00:07:39 +02:00
timokoesters
7ced54ba54
Add default run to allow compiling with just cargo run
...
Former-commit-id: 88c41361bda4b77c13d52217024e286cb7c0a565
2019-05-27 22:51:42 +02:00
timokoesters
d075d7874b
Remove unwrap
...
Former-commit-id: 68d26e366450010d1455c7662dc283cc0e0d9380
2019-05-27 22:41:19 +02:00
timokoesters
2008400169
Implement killer name in chat
...
Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802
2019-05-27 21:47:19 +02:00
timokoesters
a6439984be
Add connect, disconnect and kill messages
...
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
2019-05-27 19:45:43 +02:00
Joshua Barretto
baf740a289
Added enemies
...
Former-commit-id: 2c07c9e52a7cbfb85508e7098c528bddd9b12997
2019-05-27 12:18:14 +01:00
Timo Koesters
cc959ccb82
Merge branch 'wolf-model-fix' into 'master'
...
Wolf model assets update
See merge request veloren/veloren!181
Former-commit-id: d8d53f5b8993c13a1c6eae1588c4f2abc882856d
2019-05-26 19:12:32 +00:00
Monty Marz
8a3b308224
Wolf model assets update
...
Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd
2019-05-26 19:12:32 +00:00
Timo Koesters
276dbd97cf
Merge branch 'fix-velocity' into 'master'
...
Fix velocity while dead on client
See merge request veloren/veloren!183
Former-commit-id: f1a5aa879d27a102e176ed25fc6d3d8ad67a0238
2019-05-26 18:39:31 +00:00
timokoesters
74761b7f9c
Fix velocity while dead on client
...
Former-commit-id: e308e1b8848a38fd9fd776ddd8acb81e145429a6
2019-05-26 20:34:18 +02:00
Timo Koesters
c67d3287e2
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
2c57d898ed
Fix missing gliding animation
...
Former-commit-id: 211f285153271cad79bfdc7aa9e33608c766345d
2019-05-26 19:24:44 +02:00
Timo Koesters
e186b59ddc
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
ec4bf7279a
Add check for typing
...
Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02
2019-05-26 12:23:24 -04:00
Imbris
8754ea1661
Fix hud handle_event() match arm order
...
Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041
2019-05-26 12:12:10 -04:00
Timo Koesters
48a905ba86
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
333e905056
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
a7faa82aad
Fix invisibility
...
Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011
2019-05-26 18:01:55 +02:00
timokoesters
4ebf2e13a5
Fix wolf red and dead velocity
...
Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d
2019-05-26 17:34:00 +02:00
Imbris
de4d1a0e06
Fix pet spawning leading to NaN move_dir
...
Former-commit-id: ac68702bfdb482f32967d96e4b1da2b0ffc4e4c4
2019-05-26 11:24:26 -04:00
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
