Commit Graph

106 Commits

Author SHA1 Message Date
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
Joshua Barretto
cf487589e2 Made model cache handle non-humanoids
Former-commit-id: 4b3efb70ba24a8e4c8e1d933752e8ea28d3e8dd1
2019-05-14 01:02:37 +01:00
jshipsey
732c43ce11 first quadruped changes
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
2019-05-13 19:43:10 -04:00
Joshua Barretto
67241fec31 Massively increased efficiency of terrain meshing, chunks generate from centre
Former-commit-id: 66217b9974a791044e4b1f3d4580761bd066113a
2019-05-13 13:08:17 +01:00
Joshua Barretto
ee380782fb fmt
Former-commit-id: 140f1e4f1809b70881a51a3bd943e1697a9dc0a2
2019-05-13 11:29:35 +01:00
Joshua Barretto
4f53be633e sync
Former-commit-id: 708f80eabb9dc4052d35ed03875ef7ae485d6170
2019-05-13 11:15:03 +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_
592477752e move sample() to returning VolMap, incomplete VolMap meshing code
Former-commit-id: 77d3db6c3bf28364089647802f83d2d00f3a152d
2019-05-13 11:03:47 +01:00
sxv20_
a5db1fd0a6 fix TODO (unnecessary mpsc clone)
Former-commit-id: 6f6319fa6bf86ee4eec4778c6795f71beab21e89
2019-05-13 11:03:47 +01:00
sxv20_
c2a806910b fix chunks not getting rendered once unloaded and reloaded, remove weightings
Former-commit-id: d98d1e9bb767d80173c531e8914163c1cc23d7fc
2019-05-13 11:03:47 +01:00
sxv20_
38da6af3c6 change remeshing queue from LinkedList to HashMap, add remesh weightings
Former-commit-id: 28f0826501539848ca97721aff5057ccb4599736
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
Forest
3d14d791cf Cleaned code
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
2019-05-12 15:57:39 -04:00
Joshua Barretto
d8f6025b68 Added rendering to character selection menu
Former-commit-id: 82992904639ec2f468c70f43f3f8fe721a98de51
2019-05-12 14:03:08 +01:00
Joshua Barretto
fc0f2f0801 Added option to not stop raycasting on error
Former-commit-id: 6e094b6514bcda2fbcdfe44dbb90900b50e939c2
2019-05-12 14:03:08 +01:00
Joshua Barretto
266101c90d Added basic pets
Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f
2019-05-12 14:03:08 +01:00
Joshua Barretto
54cc9e137a fmt
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
2019-05-09 18:58:16 +01:00
Joshua Barretto
94fd0b1a22 Fixed running animation, changed movement physics
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
2019-05-09 18:57:47 +01:00
jshipsey
ac78d322d6 animation orientation fix, first jump
Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90
2019-05-09 18:57:47 +01:00
Joshua Barretto
e5db851f30 Added FXAA to post-processing shader
Former-commit-id: 9cfdb3762b63688d1b59d65066c90355c7209c62
2019-05-09 18:57:47 +01:00
Joshua Barretto
3705f9a871 Added anim_time to animations
Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487
2019-05-09 18:57:47 +01:00
Joshua Barretto
e6a40bbda2 Added jumping and Jump animation state
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
2019-05-09 18:57:47 +01:00
Imbris
eb3d8310f8 rustfmt
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
2019-05-07 01:40:03 -04:00
Imbris
99d6c92c8d rebase
Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2
2019-05-07 01:39:32 -04:00
Imbris
8232ffbd33 add load_expect, change error reporting
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
2019-05-07 00:59:05 -04:00
Imbris
990b42a6b0 remove poison err & Segment Asset impl, cleanup
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
2019-05-07 00:47:22 -04:00
Imbris
1d5020634d revamp asset system with a global singleton cache
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
2019-05-07 00:44:44 -04:00
robojumper
821ab80c5b Add post-process pipeline
Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3
2019-05-06 10:22:47 +02:00
robojumper
b2c2d89447 Run cargo fmt
Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2
2019-05-05 17:54:08 +02:00
robojumper
647d1dcc9c Smoother and terrain-aware camera
Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058
2019-05-05 17:44:56 +02:00
Forest
75f8a638f7 Ran clean code
Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c
2019-05-03 09:49:05 -04:00
Pfauenauge
c188affb4e rebase
Former-commit-id: 9c50e08fc7c4e8afa06f1f995ea1aebd386764c2
2019-05-03 13:48:53 +02:00