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,601 Commits 151 Branches 18 Tags 2.1 GiB
419ee88cc2
Commit Graph

2872 Commits

Author SHA1 Message Date
Imbris
e3e8afd99b Stop drawing entities outside the vd 
Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf
 2019-05-28 20:47:01 -04:00
Imbris
045f41dae7 Use vd setting when creating client 
Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410
 2019-05-28 19:16:06 -04:00
timokoesters
c10a43f541 Add server info 
Former-commit-id: 9e504c821e871d30f8ac7cd4acb7a8022bdb5710
 2019-05-28 22:25:46 +02:00
Joshua Barretto
f8e18eef01 Merge branch 'fix-delay' into 'master' 
Fix attack delay

See merge request veloren/veloren!194

Former-commit-id: 2846e7c2ffe0c35427a9bb7fa0c387fd6374e0c9
 2019-05-28 20:23:24 +00:00
timokoesters
c96b5c45c3 Fix attack delay 
Former-commit-id: 28f7a492adcc37cec15e3e3c0d46b6015b27ee04
 2019-05-28 21:11:29 +02:00
Forest Anderson
2fc4e9a2f8 Merge branch 'enemies' into 'master' 
Enemies

See merge request veloren/veloren!186

Former-commit-id: f920608508868119aad286cbe45599342dc1942b
 2019-05-28 19:08:02 +00:00
Joshua Barretto
8407908af2 fmt 
Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23
 2019-05-28 19:59:32 +01:00
Marcel
b5b61462ee Merge branch 'event-chat-messages' into 'master' 
Event chat messages

See merge request veloren/veloren!188

Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7
 2019-05-28 10:45:24 +00:00
timokoesters
2fc82dcf5e Fix singleplayer crash 
Former-commit-id: afbcdfe2024befbd5a225db049ce2f9a761e6df6
 2019-05-28 00:07:39 +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
timokoesters
74761b7f9c Fix velocity while dead on client 
Former-commit-id: e308e1b8848a38fd9fd776ddd8acb81e145429a6
 2019-05-26 20:34:18 +02:00
timokoesters
2c57d898ed Fix missing gliding animation 
Former-commit-id: 211f285153271cad79bfdc7aa9e33608c766345d
 2019-05-26 19:24:44 +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
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
26da091b0b add wolf 
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
 2019-05-26 10:39:57 -04:00
timokoesters
64b00f41f4 Fix invisible chars 
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
 2019-05-26 16:04:44 +02:00
jshipsey
b7cbe1e67c add wolf 
Former-commit-id: 49fee3e5056377966068bd690333f83192d1fd41
 2019-05-25 23:31:49 -04:00
timokoesters
148c015b38 TODO comment for pet fix 
Former-commit-id: 747b926a92506887bb235e9e64e2c4f286d8b31b
 2019-05-26 00:08:54 +02:00
timokoesters
4696cd2c8b Add better inputs, input validation and more 
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
 2019-05-25 23:46:56 +02:00
timokoesters
15d1a789d6 Better formatting 
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
 2019-05-25 23:21:39 +02:00
timokoesters
3697c47e33 Change client_state_pending to ClientState::Pending 
Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7
 2019-05-25 23:21:39 +02:00
timokoesters
1dbca8b994 Fix respawn position 
Former-commit-id: c4dabc71a1c7af538e2c30acbf463340a4618cc9
 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
0344f3eba8 Implement hit time delay 
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
 2019-05-25 23:21:39 +02:00
timokoesters
36e890bbd8 Fix client states server-side 
Former-commit-id: 701dd2a7f53bd0f1943cbeb61cc9c251228a4b5f
 2019-05-25 23:21:38 +02:00
timokoesters
616b922e36 Add /kill command for easier testing 
Former-commit-id: 9f27dcfd5c99327fdc6e30cac30afa5cc75cec95
 2019-05-25 23:21:38 +02:00
timokoesters
69cd712ca9 Remove all outdated components when dieing 
Former-commit-id: 9f320fba441998af24bf52be92260264f183f0d8
 2019-05-25 23:21:38 +02:00
timokoesters
30bf1cde10 Add knockback 
Former-commit-id: a703eb937ef7094a085548ca3197a575059855a0
 2019-05-25 23:21:38 +02:00
timokoesters
7d683affe9 Use clients.notify() 
Former-commit-id: 3921579a91033cbdf85929e172fc987a26fdcc9c
 2019-05-25 23:21:38 +02:00
timokoesters
449b717777 Go back to char selection on death 
Former-commit-id: a8b5ee42f432ff2da8385225b17be654420f17d1
 2019-05-25 23:21:37 +02:00
timokoesters
b26f00ddfb Fix pvp 
Former-commit-id: 98480aa29c882b0bf92364b39a8284355647956b
 2019-05-25 23:21:37 +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
Joshua Barretto
2f376509a3 Better spawn point 
Former-commit-id: 31b4df016aea512494d419515043baa288fa9ab5
 2019-05-25 06:42:26 +01: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
0a12147855 Fixed semicolon typo 
Former-commit-id: 30dbac1bccde7a5c8ebce015e04df66e9d64f1b1
 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
2548c1c31f Added worldsim API, ticking 
Former-commit-id: 50a63e44557c634f2b39ef7a580cdbeec5ed0d70
 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
Forest Anderson
2e7984ebc3 Char selection 
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
 2019-05-18 19:03:13 +00:00
Joshua Barretto
7f857daa91 Colour adjustment and server crash fix 
Former-commit-id: 7a1f6dcccc9869472f6044407d063ea86bb12dd3
 2019-05-18 17:47:55 +01:00
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Joshua Barretto
91184356e7 Added chonks 
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
 2019-05-17 18:44:30 +01:00
Joshua Barretto
5092df0e7f Improved quadruped origin 
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
 2019-05-15 17:06:58 +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
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
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
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
Joshua Barretto
faf53ad5c9 Temporary networking issue fix 
Former-commit-id: e6b47f7d8478c28d837e55b85f2f2d028e988737
 2019-05-09 19:38:37 +01:00
Joshua Barretto
54cc9e137a fmt 
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
 2019-05-09 18:58:16 +01:00
Joshua Barretto
871767ada0 Made single-player server start on random unused port 
Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd
 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
2e3288cc29 Adjusted view distance and worldgen 
Former-commit-id: 01eeb0e48bcb018111c5f32b6252beb11bccd452
 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
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00: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
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
df7a145bbc Better formatting 
Former-commit-id: 4316514f4f58dca8ed21dae00fad7a6df36b9ff1
 2019-04-23 12:12:22 +02:00
timokoesters
7fc2b3490c Answer with WrongMessage when trying to RequestState Connected 
Former-commit-id: 8384caae9f19d05f174457ab8efc6046ce30bd8c
 2019-04-23 11:14:35 +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
37367491da Cleanup ClientStates 
Former-commit-id: 060cf9800dc6f09c58f41a4baaccb1a43bd97621
 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
ba6ead4077 More wrong messages will be punished with disconnect 
Former-commit-id: 767f3226c62d7560d26a909eed8a69b8afe11110
 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
timokoesters
91057edfac Remove .internal and .internal_mut 
Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2
 2019-04-22 10:24:27 +02:00
timokoesters
ec16153164 Rename animationHistory to animation_history 
Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8
 2019-04-17 22:32:36 +02:00
timokoesters
61578b238e Sync animation states on initial connection 
Former-commit-id: 4ed67b6cbf56fceb03fa6a66b25b78925b91fc8a
 2019-04-17 22:30:52 +02:00
timokoesters
7e3f271838 Move code for initializing clients to new function 
Former-commit-id: 55f8a9b49599b6912489c597c47a13d7657f78f1
 2019-04-17 21:22:34 +02:00
timokoesters
5044fe8cb5 Simplify code 
Former-commit-id: c8bdf4199c913ab43ba08fdb19384bf7fcc6653d
 2019-04-17 20:06:06 +02:00
timokoesters
abf32d6229 Add comments 
Former-commit-id: 950c811256b8c20f58e4bb3c998acc746c4b929d
 2019-04-17 19:41:20 +02:00
timokoesters
b9607ef405 Fix #21 by checking animation history 
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
 2019-04-17 19:39:12 +02:00
timokoesters
1ae18fecf8 Change timeout to 20s 
Former-commit-id: dca0d08a06c27259cdaaf0138024f53c6c93d94e
 2019-04-17 16:46:04 +02:00
Joshua Barretto
9286de1368 Added ForceUpdate component upon teleport-related commands 
Former-commit-id: ff10c863466e6f4f6cc931b5980917145f38b222
 2019-04-17 14:00:24 +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
edcabfa68f Fix creation update 
Former-commit-id: 3ad0f4cd3ee8f319229f85f1c0c289be9d4b5bfb
 2019-04-17 01:39:39 +01:00
Joshua Barretto
2c650f9cff Added basic agent AI 
Former-commit-id: bb17edc8f2027c0c63c6a3ef0fc80c7a68c9aa05
 2019-04-17 01:39:39 +01:00
sxv20_
dbccb34582 replace if-let with match 
Former-commit-id: ed39cbb1ccc69302cb65822ad4a4cfecd2bd8f86
 2019-04-16 18:08:47 +01:00
sxv20_
4e3c97862e Update docs 
Former-commit-id: 381a759ebcefb4f0fad76fe66ca2720b572849b5
 2019-04-16 18:08:47 +01:00
sxv20_
447bf18a63 add documentation 
Former-commit-id: 5abbbaf9b24702dffc345466b1af60ee594bf01a
 2019-04-16 18:08:47 +01:00
sxv20_
cf3235d351 move chat command code to cmd.rs 
Former-commit-id: 25bbcceae51024439dbf6c143a49e3d5d55e7f4b
 2019-04-16 18:08:47 +01:00
sxv20_
ee47b598aa use handlers instead of hard-coding for commands 
Former-commit-id: 80d693254bfbfc7ae0ea4dcbdc76301dca067468
 2019-04-16 18:08:47 +01:00
sxv20_
f8d75d900e Clean up help message and if-let 
Former-commit-id: 450281467a92b2b8186df74d83d108457513277a
 2019-04-16 18:08:47 +01:00
Sebastian Venter
031e4b36d6 add chat commands, rustfmt 
Former-commit-id: 64941127598b53c64fe2e0e7c167f0ce3f358060
 2019-04-16 18:08:47 +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
bbc5aa1b0d Disabled informing clients of chunks temporarily 
Former-commit-id: ab964ebfdae55e1fcf1002d7e7622d58e538c83b
 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
11630877e3 Moved figure rendering to a better place 
Former-commit-id: 51ca948e131c20151c97f9f8454c80c47a9154b0
 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
Joshua Barretto
8a0adab381 Fixed ping timeout logic 
Former-commit-id: 080ca9d4149ec0ecddd92c475d77e4fc92f6edaa
 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
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
Joshua Barretto
2e613178a0 Component sync + UID system 
Former-commit-id: 5ecddc0e1f9c1a15f99dd167b825178c972da062
 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
c16a257ae3 Added server-cli, UI tests 
Former-commit-id: 93bf5b39138920aa7a4a773a8247d716866c4a05
 2019-01-30 12:11:34 +00:00
Joshua Barretto
41b6672743 Added Terrain type to scene 2019-01-15 15:13:11 +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