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 |
|
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 |
|