Commit Graph

140 Commits

Author SHA1 Message Date
timokoesters
a6439984be Add connect, disconnect and kill messages
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
2019-05-27 19:45:43 +02: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
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
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
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
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
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
15d1a789d6 Better formatting
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
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
f5751d65b1 Fix terrain not loading
Former-commit-id: f9279878ab051c6083c4a1f5125531fe79151fb8
2019-05-25 23:21:39 +02:00
timokoesters
a0918d11b6 Fix red effect
Former-commit-id: 1fd90a40aaaccb98aeb34715ee7cad5c0b3b3de7
2019-05-25 23:21:38 +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
jshipsey
e84d19b5c8 fmt
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
2019-05-24 19:01:10 -04:00
jshipsey
8e896cc3c4 rotation simplification
Former-commit-id: d6ddc514d76dee88477964a7cf053122e39a67a8
2019-05-24 18:43:49 -04:00
jshipsey
98630b3692 attack state
Former-commit-id: 6d8a6b68aff7ae2439eb42b2cee017cec99d96df
2019-05-24 18:42:22 -04:00
jshipsey
ac41a2241c laying groundwork for combat anims, untangling skeleton
Former-commit-id: 442e7059ce0e62429c263fd0b95ee98b7d8bc0d2
2019-05-24 18:33:56 -04:00
jshipsey
a65d6e733f rotation simplification
Former-commit-id: 991b5710d14c27af8f34745caeef95df47be0bb0
2019-05-24 18:33:55 -04:00
jshipsey
5049b9a2ae attack state
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
2019-05-24 18:33:55 -04:00
Imbris
24a14b083f Scaling of ingame text rasterization to match final size
Former-commit-id: 9f9e900afef2400af35d579e66ba95097e169b87
2019-05-24 02:31:04 -04:00
Imbris
7fd3854093 ingame_ui
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
2019-05-24 02:31:01 -04:00
Joshua Barretto
fc25dc8c7f fmt
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
2019-05-21 23:31:38 +01:00
Joshua Barretto
5b2da36fd0 Added mega worldgen
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
2019-05-21 22:51:41 +01:00
Louis Pearson
5a04e98725 Change asset paths to be relative
Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6
2019-05-18 13:37:44 -06:00
Forest Anderson
2e7984ebc3 Char selection
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
2019-05-18 19:03:13 +00:00
Cody
6b09fd7c53 Pedantic comment and language fixes.
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
2019-05-17 18:32:07 -04:00
Joshua Barretto
7174830279 fmt
Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc
2019-05-17 18:54:56 +01:00
Joshua Barretto
91184356e7 Added chonks
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
2019-05-17 18:44:30 +01:00
Imbris
c780b85f24 Stop crash when minimizing
Former-commit-id: ca52ae2520bf5616d24f27d98244a470966f3573
2019-05-17 01:13:14 -04:00
Joshua Barretto
db4be8e492 Updated sphynx
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-17 00:05:46 +01:00
Joshua Barretto
6f984ca181 Added figure colour to shader and health component
Former-commit-id: e2c23e5132991cc436a678af43782e31ffc55516
2019-05-16 23:34:57 +01:00
Joshua Barretto
7b09070fc8 fmt
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
2019-05-16 20:23:45 +01:00
jshipsey
50fa3cf098 glide anim
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
2019-05-16 00:40:35 -04:00
Joshua Barretto
8af606e348 Fixed singleplayer logout crash due to orphaned mesh worker
Former-commit-id: 2b8c5aa0c906223ac043db8137ad95a0e29407c5
2019-05-15 13:26:14 +01:00
Joshua Barretto
1209f0393d Added figure colour to shader and health component
Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96
2019-05-15 13:26:14 +01:00
jshipsey
efc019f7a4 idle, run, jump animations
Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9
2019-05-15 00:24:36 -04:00
Joshua Barretto
49cc422dfa Fixed quadruped animation selection
Former-commit-id: 03315efa2c88a4ac3517835b25f7a14cd1599cf0
2019-05-14 12:37:05 +01:00
jshipsey
2a2b873f56 added skeleton, needs animation fix
Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e
2019-05-13 22:24:34 -04:00