Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,281 Commits 151 Branches 18 Tags 2.1 GiB
a06e79b089
Commit Graph

4763 Commits

Author SHA1 Message Date
Forest Anderson
413b67e6ad Merge branch 'master' into 'master' 
Fixes match pattern code that rendered an actionable branch unreachable.

See merge request veloren/veloren!120

Former-commit-id: 06bcf5a6caf32fa80576d56766571c7f9ce7d54d
 2019-05-12 20:40:09 +00:00
Forest
3d14d791cf Cleaned code 
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
 2019-05-12 15:57:39 -04:00
Joshua Barretto
a8981378bf Improved performance and compilation speed for debug builds 
Former-commit-id: 5d8b1c27a8a2ebfe63797969ee2aba7452a09dd3
 2019-05-12 18:43:55 +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
timokoesters
bdf241bf24 Add TODO comment 
Former-commit-id: fdc9e6d65d9d534e238a6ba2d1c2e66f194d975e
 2019-05-11 21:48:05 +02:00
timokoesters
4ce1f9ee54 Temporary fix for falling into void 
Former-commit-id: 8e3d9c0c34e897f13cc60d5968f390ed0107dd76
 2019-05-11 21:38:05 +02:00
MidgeOnGithub
bbe971de7f Fixes match pattern code that rendered an actionable branch unreachable. 
Former-commit-id: 69f562bf54307ab7402dabe52e07a7a46ea4c4b1
 2019-05-10 23:38:19 -04:00
Forest Anderson
cf22cb99e7 Ran fmt 
Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c
 2019-05-09 17:30:44 -04:00
Joshua Barretto
89f9589cf0 Fixes to head animations 
Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a
 2019-05-09 20:18:13 +01:00
Joshua Barretto
54cc9e137a fmt 
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
 2019-05-09 18:58:16 +01:00
Joshua Barretto
3b44bda43c Secret feature 
Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2
 2019-05-09 18:57:47 +01:00
Joshua Barretto
cf4e02252a Smartened up terrain generation 
Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
 2019-05-09 18:57:47 +01:00
Joshua Barretto
94fd0b1a22 Fixed running animation, changed movement physics 
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
 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
Joshua Barretto
9ebe3c3e6f Added a delta time cap to avoid missing important physics events 
Former-commit-id: e9f14ddda0963537ae6593c2dacc6a877f88c824
 2019-05-09 18:57:47 +01:00
Joshua Barretto
342ea6aa65 Significantly upped view distances 
Former-commit-id: 4cd306ebfa1acd765cb68d4a6d5a026b43fafa2f
 2019-05-09 18:57:47 +01:00
Joshua Barretto
3cd48ba468 Added lz4 compression to networking 
Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
 2019-05-09 18:57:47 +01:00
Joshua Barretto
33e93ef25f Added basic byte XOR checksum 
Former-commit-id: 2e8c23ce51038fd7442cc489d9cb45838f3378c3
 2019-05-09 18:57:47 +01:00
Forest Anderson
8b4d998943 Merge branch 'fix-doc-test' into 'master' 
Fix doc test

See merge request veloren/veloren!112

Former-commit-id: 7330a2022ac892a60a7c9df7ac42d7b054622301
 2019-05-08 23:06:07 +00:00
Imbris
470e63a691 Remove or uncomment commented code 
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
 2019-05-07 21:59:35 -04:00
timokoesters
24161d4521 Fix doc test 
Former-commit-id: e08cb9fdfca5b3d12a34220ef4af042d6fb913e6
 2019-05-07 20:59:06 +02:00
timokoesters
7132cfdf5b Fix doc test 
Former-commit-id: e347ad79dd229d72f70820189e6ae6011868c5ef
 2019-05-07 20:36:07 +02:00
Imbris
81c5a070c5 move conrod font out of common 
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
 2019-05-07 02:25:26 -04:00
Imbris
eb3d8310f8 rustfmt 
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
 2019-05-07 01:40:03 -04:00
timokoesters
f695973bb2 Make fonts work, Remove style 
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
 2019-05-07 01:08:27 -04:00
timokoesters
53a78e1c2f Remove unnecessary debug from try_open_with_path 
Former-commit-id: 891d24c247d15f406ebd24ca923b62e6f43bf9ea
 2019-05-07 01:00:48 -04:00
Imbris
cb507ebfa0 small comment 
Former-commit-id: 13e443edbb52e1c1423446168235c986b8999de0
 2019-05-07 00:59:06 -04:00
Imbris
8232ffbd33 add load_expect, change error reporting 
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
 2019-05-07 00:59:05 -04:00
Imbris
33fbcd1e93 formatting tweaks 
Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa
 2019-05-07 00:48:39 -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
timokoesters
c7dd3e96cc Start work on image_ids! and asset loading 
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
 2019-05-07 00:28:05 -04: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
Imbris
7a192a9466 add nightly feature back for specs -> shred 
Former-commit-id: b483f75c10cc47faa66ab8063f7747e654068634
 2019-05-01 14:46:06 -04:00
Imbris
f0b0b83cc8 Store thread pool in State, Remove unnecessary dep 
Former-commit-id: cbce09915267f264801c174817b97ed3528715fd
 2019-05-01 14:10:43 -04:00
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
timokoesters
f35e8d7b98 Fix gitignore and delete gitignores in subdirs 
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
 2019-04-29 20:43:04 +02:00
Joshua Barretto
e4d6d96afc Remove post debugging 
Former-commit-id: 4a82bf8b6178fb88d5a6ea93706fb4e97ac2256d
 2019-04-25 20:25:22 +01:00
Joshua Barretto
5e38eee8d4 Added chunk deletion 
Former-commit-id: 63c29e43c4dc28097aaf4e0ff72977c7db5cc28f
 2019-04-25 20:08:26 +01:00
Joshua Barretto
f136a63f69 Adjusted terrain loading and meshing performance 
Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2
 2019-04-25 17:52:11 +01:00
Joshua Barretto
0b0c71592c Fixed orientation issue 
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
 2019-04-25 17:52:11 +01:00
Joshua Barretto
fc8b7e9750 Worked on improving networking and terrain 
Former-commit-id: e5ce819036a01f274c1c114bcd3b50fa42858703
 2019-04-25 17:52:11 +01:00
timokoesters
927f3a12ba Fix ray issue after max_iteration 
Former-commit-id: 55afdeeb0358934e3874ab3ca573e8cc71904ea1
 2019-04-25 17:52:11 +01:00
timokoesters
c37db43580 Fix ray position 
Former-commit-id: 772d5652d44c9467d22c9c93547ac154ce3110b3
 2019-04-25 17:52:11 +01:00
Joshua Barretto
9105bf0811 Added better terrain collisions 
Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f210de09df Added raycasting (needs testing) and basic character terrain collision 
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f9f434a1c2 Started work on worldgen 
Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d
 2019-04-25 17:52:11 +01:00
timokoesters
701755a8e2 Add disconnect handling 
Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f
 2019-04-23 14:01:16 +02:00
timokoesters
3bf09f9f9c Handle errors with error_state instead of disconnect 
Former-commit-id: cad5bbf9a5bb22dc6adf81d248d85d6a5d6aa140
 2019-04-22 23:00:25 +02:00
timokoesters
06693136b6 Fixed names, debug and notify 
Former-commit-id: f58dedf7c4eb9b284982588fc6b19bbe3edb0391
 2019-04-22 23:00:24 +02:00
timokoesters
e9027c6433 Split connecting from registering 
Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9
 2019-04-22 23:00:24 +02:00
timokoesters
9a48e2fd42 Rename ClientState Connected -> Registered, Visitor -> Connected 
Former-commit-id: 34f6726203b7d20b42937a02f48d8920ca3f1d7a
 2019-04-22 23:00:23 +02:00
timokoesters
07a2aab8a3 Rename Disconnected to Visitor 
Former-commit-id: aeb729a933cda380c03efe346347fc4dc0648dfb
 2019-04-22 23:00:23 +02:00
timokoesters
fc2e6c3624 Clean up client state code 
Former-commit-id: 2469a49abd23038838f6176b7f5cf0b303e8bee5
 2019-04-22 23:00:22 +02:00
timokoesters
794b9cafad Implement ClientStates 
Former-commit-id: f6167fd6de6fd1a3309224409cac77193be982e2
 2019-04-22 23:00:22 +02:00
timokoesters
802c484a38 Make character model more variable 
Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef
 2019-04-22 23:00:21 +02:00
Joshua Barretto
779d50b6de Fixed clock 
Former-commit-id: 585000319073e06f6511b3ef2c3db1135167d9d4
 2019-04-22 17:50:18 +01:00
Joshua Barretto
247ba6621a Made NPC movement smoother 
Former-commit-id: 105908cf0118113408acd5ad7dce191fe405f88f
 2019-04-22 17:50:18 +01:00
timokoesters
91057edfac Remove .internal and .internal_mut 
Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2
 2019-04-22 10:24:27 +02:00
Imbris
1143c58e37 add graphic cache clearing on resize 
Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b
 2019-04-19 21:35:12 -04:00
timokoesters
86898c26a0 Rename lastAnimation to last_animation 
Former-commit-id: 7eabea72ad5ee2cfed20b3927a828eb55fae8e33
 2019-04-17 22:44:10 +02:00
timokoesters
ec16153164 Rename animationHistory to animation_history 
Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8
 2019-04-17 22:32:36 +02:00
timokoesters
b9607ef405 Fix #21 by checking animation history 
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
 2019-04-17 19:39:12 +02:00
Joshua Barretto
6693d22ecd Fixed animation copypasta bug 
Former-commit-id: e4b06e4e7c50214c7d7d9cc618ea7f117dc78ccc
 2019-04-17 10:07:02 +01:00
Joshua Barretto
8029edde0b Moved animation determination to Control ECS system 
Former-commit-id: 6650bc4d882d3f6779f99afea2e05155ad008282
 2019-04-17 09:59:38 +01:00
Joshua Barretto
2c650f9cff Added basic agent AI 
Former-commit-id: bb17edc8f2027c0c63c6a3ef0fc80c7a68c9aa05
 2019-04-17 01:39:39 +01:00
Piotr
ddb32eec30 Animation States 
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
 2019-04-16 14:29:44 +00:00
Joshua Barretto
c98d841890 Fixed physics sync 
Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf
 2019-04-15 00:29:28 +01:00
Joshua Barretto
f69ad40bd5 Fixed aspect on scene start, added more information to post errors 
Former-commit-id: 0daff37cbcad6f906962216ce923a005da6861c1
 2019-04-14 16:05:51 +01:00
Joshua Barretto
7fc923f2a7 Rebased 
Former-commit-id: 017002bca2078f48998ecb412480492556082491
 2019-04-14 14:23:43 +01:00
Joshua Barretto
a444826f0b Fixed zombie network worker threads 
Former-commit-id: a8e74a9a8e42a0d5e1a79d87a1daf398e6294c73
 2019-04-14 14:23:43 +01:00
Joshua Barretto
413bdf44e5 Extended timeout on huge transfer test to avoid failure on debug 
Former-commit-id: 7fa49db2ce310ff83b0c7ba2c4525771f16e7842
 2019-04-14 14:23:43 +01:00
Joshua Barretto
9f5aab3564 Prevented postal workers spinning for too long 
Former-commit-id: e535f5745c817b7fd5f109711aaa65e6c78d6ecc
 2019-04-14 14:23:43 +01:00
Joshua Barretto
f4260706e6 Updated package versions 
Former-commit-id: bb0d1efd718ddef598fbb894498a43ad014a11c0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
3112486005 Added partial chunk loading, package section to workspace Cargo.toml 
Former-commit-id: 4164daf4ccbe6695f664a44d0fce0ee10df39b8d
 2019-04-14 14:23:43 +01:00
Joshua Barretto
507c47e771 Rewrote netcode, added basic chunk synching 
Former-commit-id: e9f76f7fa9dbe0c81cd4c998bf0f0b3eec9235cb
 2019-04-14 14:23:43 +01:00
Joshua Barretto
f27b5fa975 Added server-side chunk generation 
Former-commit-id: 72e02f8ec711ec4fac3111b591c4b08086dee4e3
 2019-04-14 14:23:43 +01:00
Joshua Barretto
3d9f8105e6 Started work on server-side chunks 
Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28
 2019-04-14 14:23:43 +01:00
Joshua Barretto
62b91eb01b Integrated Sphynx 
Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc
 2019-04-14 14:23:43 +01:00
Imbris
fb83c836a1 make to_server() blocking, post fixes & cleanup, use server address 
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
 2019-04-14 15:04:44 +02:00
Marcel Märtens
251cccffe5 add simple interface to get assets from various locations 
Former-commit-id: 2ee6c4ef811e935eb8684a2cd827a97b8ad0be7a
 2019-04-13 03:40:59 +02:00
Pfauenauge
8ecb849970 Char Window, Mana, Health, Exp-Bar 
Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128
 2019-04-06 00:36:04 +02:00
Pfauenauge90
6ebff7ce2c Merged with UI-Input 
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
 2019-04-04 16:45:57 +02:00
Imbris
48d5c70b2a minor fixes 
Former-commit-id: 56d6b123d6def65b3f7660eea6490277597813b0
 2019-03-29 01:56:08 -04:00
Pfauenauge90
60df735e3b accessories tab 
Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd
 2019-03-28 23:03:39 -04:00
Joshua Barretto
3214164070 Working with upstream 
Former-commit-id: 6543387e4df9a96a443c510c9e382ace3731d2f6
 2019-03-19 14:12:42 +00:00
Joshua Barretto
c75625f179 Physics update adjustment 
Former-commit-id: 10a8828b1ac496c7419672b88049fbda848d9d9d
 2019-03-19 11:35:38 +00:00
Joshua Barretto
ffc4e6ebd4 Improved State API design 
Former-commit-id: a32ab93409b1044fe2838f684d30ca2b963d4eb2
 2019-03-19 11:35:38 +00:00
Joshua Barretto
99bd0630b7 Added post refactor unit tests 
Former-commit-id: 66ea368de32dc6dfe22fc752476b71856e0588a0
 2019-03-19 11:35:38 +00:00
Joshua Barretto
664f28a972 Patched in netcode refactor 
Former-commit-id: 34a3b9a95129edad6dc8280d9a3cb41581d4d386
 2019-03-19 11:35:38 +00:00
Joshua Barretto
a8b0039898 Added networked entity updates, player entity allocation 
Former-commit-id: b81d6e38a74f846d64c092d1422dc402f369100c
 2019-03-19 11:35:38 +00:00
Joshua Barretto
bb93f29522 Fixed client/server comms bug 
Former-commit-id: fffc9cbf59784e7e2c9c2d9a60b8f2520b6f41fb
 2019-03-19 11:35:38 +00:00
Tanner Donovan
d9f179b980 update Duration method calls 
Former-commit-id: 4343e30583f74094a73365465a1d1ca912b693e6
 2019-03-18 16:46:37 -07:00
Joshua Barretto
2e613178a0 Component sync + UID system 
Former-commit-id: 5ecddc0e1f9c1a15f99dd167b825178c972da062
 2019-03-04 19:58:58 +00:00
Joshua Barretto
ef333877ae Added Uid marker component 
Former-commit-id: b0aae7a8e6dd075996f3bee6cc7be29763f6cdaa
 2019-03-04 19:58:58 +00:00
Joshua Barretto
dbbcc1e80e Added basic networked communications, chat communication 
Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa
 2019-03-04 19:58:58 +00:00
Joshua Barretto
72e0cacfef Merge branch 'physics' into 'master' 
Player movement with basic physics ecs system

See merge request veloren/fresh!9

Former-commit-id: 87ca6d878c32b7fae9de9994ab2771129d76c747
 2019-03-02 19:51:37 +00:00
Imbris
33b8922aa4 move/name velocity constant, rename move_vec, simplify cam rotate_by() 
Former-commit-id: 0835a9e91bd0133922f5d4e9731b9f6b6b547a0b
 2019-03-02 14:43:51 -05:00
Imberflur
6f5f80f749 add player movement with basic physics ecs system 
Former-commit-id: f2e151971a42b25bfd1971311f5a06535a577007
 2019-03-01 22:48:30 -05:00
Joshua Barretto
3f5782e993 Netcode usability improvements 
Former-commit-id: a0e0d0b6fd503b4de9c60d2fcb02562def98c75e
 2019-02-25 16:45:54 +00:00
Maciej Ćwięka
d011256542 Moved PostBox and PostOffice to separate files, finished implementing PostBox, started implementing PostOffice, fixups all over the place 
Former-commit-id: 7a891b8937498b534ad611d7ede29de01ba88ea7
 2019-02-19 16:59:50 +00:00
Joshua Barretto
8a37662cf0 Cleaned up codebase, added cursor grab toggle 2019-01-23 22:21:47 +00:00
Joshua Barretto
248577bdef Added test terrain loading and meshing 2019-01-23 20:01:58 +00:00
Joshua Barretto
41b6672743 Added Terrain type to scene 2019-01-15 15:13:11 +00:00
Joshua Barretto
bd561dd1aa Added terrain pipeline 2019-01-14 23:13:58 +00:00
Joshua Barretto
ae4f1ae2ea Added vox trait 2019-01-14 18:49:53 +00:00
Joshua Barretto
8184bc6fc0 Added figures, segments, test .vox files, basic animation test 2019-01-13 20:53:55 +00:00
Joshua Barretto
b37a6b67f9 Added time of day, tick time, basic skybox shader and client to voxygen 2019-01-12 15:57:19 +00:00
Joshua Barretto
523db9f054 Started work on adding terrain 2019-01-02 19:22:01 +00:00
Joshua Barretto
819af1594f Initial structure 2019-01-02 17:23:31 +00:00