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
954 Commits 151 Branches 18 Tags 2.1 GiB
942096c754
Commit Graph

124 Commits

Author SHA1 Message Date
Imbris
942096c754 Only send physics updates for entities within vd 
Former-commit-id: d3307641cd31418bf8b9831296a96d58926184e0
 2019-05-28 20:47:03 -04:00
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
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