163 Commits

Author SHA1 Message Date
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
Joshua Barretto
0bb217d53f Added docs to assets::load_map
Former-commit-id: 50397d3c5d8c30ea392b784d9309d0e2ecb28f73
2019-05-25 09:38:30 +01:00
Joshua Barretto
92391883a9 fmt
Former-commit-id: 689464ed1009ebfd74769fa113fc7b433ea62bbd
2019-05-25 06:54:47 +01:00
Joshua Barretto
c8ba5d9f89 Basic pine tree spawning
Former-commit-id: e58374724f6c9cb4a54ae96abd3420b02207fd30
2019-05-25 05:51:45 +01:00
Joshua Barretto
4d73f38e6d Refactored worldgen sampling, added cache layer
Former-commit-id: 3ad5277ed0c871d6678a42629145cb722d4c76c5
2019-05-25 05:51:45 +01:00
Joshua Barretto
86bb277116 Added snow to mountains, fixed hash sub-chunk allocation failure
Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120
2019-05-25 05:51:45 +01:00
Joshua Barretto
cafbb45e52 Small worldgen fixes and hash chunk optimisation
Former-commit-id: f1cb9a010f5d0882d4bc21ede1f405a8a7fa867c
2019-05-25 05:51:45 +01:00
jshipsey
f94a8b636d restored previous animations with new bone setup
Former-commit-id: e507dba772d931e3ddebd0c4ecc8e038521a2e3e
2019-05-24 18:51:33 -04:00
jshipsey
5049b9a2ae attack state
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
2019-05-24 18:33:55 -04:00
Joshua Barretto
fc25dc8c7f fmt
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
2019-05-21 23:31:38 +01:00
Joshua Barretto
0c78264ebc Added spawn point
Former-commit-id: 04ea38df61d3610d679368166de220243ef1bfba
2019-05-21 23:04:39 +01:00
Joshua Barretto
feece604be Restarted worldgen
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 22:51:41 +01:00
Joshua Barretto
a0dfa3fddc Added basic mountain/valley worldgen
Former-commit-id: 5a45f18fcdf523841ee8433ba2ff0b8765eadf3a
2019-05-21 22:51:41 +01:00
Pfauenauge90
c13206d82d Basic worldgen
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
2019-05-21 22:51:41 +01:00
Joshua Barretto
b48b9f0141 Attempted fix of deltatime bug
Former-commit-id: d287bbf541dd318a7034f1e3ad4d9a167ac3c344
2019-05-21 22:51:41 +01:00
Joshua Barretto
5b2da36fd0 Added mega worldgen
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
2019-05-21 22:51:41 +01:00
Joshua Barretto
3508e4afcb Added view distance configuration
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
2019-05-19 01:45:02 +01:00
Louis Pearson
d55e803ab5 Use PathBuf to load files
Former-commit-id: b72084fab1b8faeabc47eee927654f963643bb78
2019-05-18 13:30:52 -06:00
Forest Anderson
2e7984ebc3 Char selection
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
2019-05-18 19:03:13 +00:00
Piotr Korgól
0e2b09a5f8 Create a skeleton for the Inventory system and Item system
Former-commit-id: 2579b70257ee9faa6d8614c33677ad0fc3c77a0d
2019-05-18 16:46:14 +00:00
Cody
6b09fd7c53 Pedantic comment and language fixes.
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
2019-05-17 18:32:07 -04:00
Joshua Barretto
5a2c7a7813 Removed accidental println
Former-commit-id: a203e8105cd42463b9a72245e1623dde68874571
2019-05-17 22:55:50 +01: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
Joshua Barretto
fa052a22b7 More lenient max deltatime to avoid physics lag
Former-commit-id: bdd4a9d634f9aa1e52ab3885e5b8a49348011760
2019-05-17 13:39:40 +01:00
Joshua Barretto
3940e73b31 Stopped syncing time
Former-commit-id: 8453a8f1c2361b1e6b5bb7f11470c33f2c0f910b
2019-05-17 00:26:18 +01:00
Joshua Barretto
db4be8e492 Updated sphynx
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-17 00:05:46 +01:00
Joshua Barretto
7b09070fc8 fmt
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
2019-05-16 20:23:45 +01:00
Joshua Barretto
a0e685c03f Improved falling glider physics
Former-commit-id: 752c1291c7d38282312446c5391c2fb4fa7cbf6e
2019-05-16 14:13:28 +01:00
Joshua Barretto
bb95f5bf78 Added correct gliding animation calculation
Former-commit-id: 625310820c9cf7a1d37401875db43b5b597eb590
2019-05-16 12:04:42 +01:00
jshipsey
50fa3cf098 glide anim
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
2019-05-16 00:40:35 -04:00
Joshua Barretto
5092df0e7f Improved quadruped origin
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
2019-05-15 17:06:58 +01:00
Joshua Barretto
7ac973623f Fixed friction
Former-commit-id: d9ac7fa7fb98c2ac829470fa8deeb314cc0f15f6
2019-05-15 13:26:14 +01:00
Joshua Barretto
5c57568d31 Fixed physics
Former-commit-id: b4b208754e38aba2150efe99d319638910f64904
2019-05-15 13:26:14 +01:00
Joshua Barretto
8ef8c178d7 Added test gliding
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
2019-05-15 13:26:14 +01:00
Joshua Barretto
e8b6e120dc Fixed pet spawning bug
Former-commit-id: 78dcd034940a4de1ce7d66a79d9134be6ee281f2
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
Louis Pearson
85e97e16d3 Change vec<u8> to BufReader
Former-commit-id: 0e91de7976357c96ac58e4f4293c680b9ab98155
2019-05-15 13:24:32 +01:00
jshipsey
2a2b873f56 added skeleton, needs animation fix
Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e
2019-05-13 22:24:34 -04:00
jshipsey
732c43ce11 first quadruped changes
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
2019-05-13 19:43:10 -04:00
Joshua Barretto
0b1ea359fa Adjustments to VolMap
Former-commit-id: 53ba7185102e7ff17825891d02bd0e26e5fe1076
2019-05-13 11:06:59 +01:00
Joshua Barretto
edfd2290eb Massively sped up VolMap offset calculations
Former-commit-id: 8f3cdf57a77691ca60c0921bc86a79c8cfe36539
2019-05-13 11:06:58 +01:00
Joshua Barretto
216819ca92 fmt
Former-commit-id: 4fd53e02969d9d044367d81640a2975043c6953a
2019-05-13 11:06:58 +01:00
Joshua Barretto
761c6e9cf8 Switched to actor system
Former-commit-id: d2a482f6209aff7aaa4e747e35ce4a7c8a79cdfc
2019-05-13 11:06:58 +01:00
sxv20_
f600eca072 start fixing chunk rendering, noticed stack overflow crash
Former-commit-id: 334904276580cd78f5d5e3bf010a86fcd822cfdf
2019-05-13 11:03:47 +01:00
sxv20_
e20c2a1e00 Move VolMap to HashMap<_, Arc<Chunk>>
Former-commit-id: e209891596acbb1705876a1cb7ccce3ac2fe2d45
2019-05-13 11:03:47 +01:00
sxv20_
a23f9d90ea cache a chunk while cloning to increase performance (?)
Former-commit-id: 69c1fa67b13a8de49f2c73e9526f548779e988c1
2019-05-13 11:03:47 +01:00
jshipsey
98380df9b2 pipeline fix
Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138
2019-05-12 22:39:16 -04:00
jshipsey
e8c91f753e Merge branch 'master' of https://gitlab.com/veloren/veloren
Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291
2019-05-12 21:52:44 -04:00
jshipsey
dec9632460 animation adjustments
Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0
2019-05-12 20:52:30 -04:00