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
5,376 Commits 151 Branches 18 Tags
Commit Graph

5376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Forest Anderson
2751c171d6 Merge branch 'angel/add-dutch-translation' into 'master' 
Added Dutch translation

See merge request veloren/veloren!1446
 2020-10-22 18:09:52 +00:00
Joshua Barretto
e038491e9e Merge branch 'zesterer/clouds' into 'master' 
Clouds

See merge request veloren/veloren!1442
 2020-10-21 21:05:26 +00:00
Joshua Barretto
b7215c9bf1 Clouds 2020-10-21 21:05:25 +00:00
Forest Anderson
114140abf2 More small fixes 2020-10-21 19:02:59 +00:00
Forest Anderson
173247d5f5 Some fixes by @Jurre 2020-10-21 18:45:00 +00:00
Forest Anderson
a1d5184e9e Added Dutch translation, created by @Namp007 2020-10-21 13:39:36 -04:00
Justin Shipsey
0047af93cf Merge branch 'snowram/beast-animation' into 'master' 
Snowram/beast animation

See merge request veloren/veloren!1297
 2020-10-19 15:59:18 +00:00
Marcel
c8b4b3c3f5 Merge branch 'xMAC94x/netfixC' into 'master' 
xmac94x/netfixc

See merge request veloren/veloren!1440
 2020-10-19 15:24:07 +00:00
jiminycrick
b78a75293b Fixed hammer AI and added axe AI 2020-10-19 16:20:59 +02:00
Snowram
0cfa7d5c3e Addressed comments 2020-10-19 16:20:59 +02:00
jiminycrick
4111fb117e Addressed comments on agent code 2020-10-19 16:20:59 +02:00
jshipsey
e7079456c7 remove commented code 2020-10-19 16:20:59 +02:00
Snowram
4491996e9d Add missing biped_large anims 2020-10-19 16:20:59 +02:00
jshipsey
3ab0385cea bipedlarge hammer fixes 2020-10-19 16:20:59 +02:00
jshipsey
9503cf9cb9 roshwalr fix 2020-10-19 16:20:59 +02:00
jshipsey
c5e61f7d7c small fixes 2020-10-19 16:20:59 +02:00
Snowram
f17ea65135 Add BeastClaw npc weapontype 2020-10-19 16:20:59 +02:00
Snowram
7ac662b82e Add roshwalr npc 2020-10-19 16:20:59 +02:00
jiminycrick
23df57627d fixed agent code for staff rework 2020-10-19 16:20:59 +02:00
jshipsey
dc3454cceb rebase 2020-10-19 16:20:58 +02:00
Snowram
8d5742776f Rename Saurok, various anim fixes 2020-10-19 16:20:58 +02:00
jshipsey
a2ee32140c fix agent bug 2020-10-19 16:20:58 +02:00
jshipsey
f81a4446af werewolf work 2020-10-19 16:20:58 +02:00
jiminycrick
ad5dd0b043 Added secondary skills to agent code (except bow) 2020-10-19 16:20:58 +02:00
Snowram
e2308ef96e Add sand, snow and wood raptor npcs 2020-10-19 16:20:58 +02:00
Snowram
dbac820034 Add treant npc 2020-10-19 16:20:58 +02:00
Snowram
6bc72f7f0b Standardizes character bone names 2020-10-19 16:20:58 +02:00
Snowram
472dc2b2b2 More bipedlarge anim work 2020-10-19 16:20:58 +02:00
Snowram
ca98fd6512 Add bipedlarge spin and beta anims 2020-10-19 16:20:58 +02:00
unknown
aac897d11b Better bipedlarge weild, charge and shoot anims 2020-10-19 16:20:58 +02:00
unknown
5f1ff1de99 Assigns a ToolKind to bipedlarge weapons 2020-10-19 16:20:58 +02:00
jshipsey
11e9a0bb34 rebase fix 2020-10-19 16:20:58 +02:00
Snowram
996e295be6 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
f9884b8a56 Add beast attributes 2020-10-19 16:20:57 +02:00
Snowram
feef00dc5d Improve bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
1bf0972c86 Initial bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
ae07c9ffb5 Add werewolf npc 2020-10-19 16:20:57 +02:00
Marcel Märtens
08a51eac04 Streams no longer panic when recv on a StreamClosed Stream. Panicing is a "feature" of futures::channel 
Refactor the `send_raw` and `recv_raw` completly. We now expost `Message` which has a public `serialize` and `deseialize` fn for the first time.
This makes using the `raw` methods of a stream much easier and is a requierement for using "copy_less" sending to multiple streams
 2020-10-19 10:23:30 +02:00
Marcel Märtens
60effe0f37 add a try_recv fn to Stream which is NOT async 2020-10-19 10:23:27 +02:00
Justin Shipsey
64e928444b Merge branch 'UMR1352/fix#793' into 'master' 
Fix #793: hide message for player coming online

Closes #793

See merge request veloren/veloren!1443
 2020-10-18 21:04:23 +00:00
Enrico Marconi
04effe8db1 Fix #793 2020-10-18 11:03:02 +02:00
Marcel
d16fb731ca Merge branch 'UMR1352/fix#788' into 'master' 
Fix issue #788

Closes #788

See merge request veloren/veloren!1432
 2020-10-16 12:17:49 +00:00
Samuel Keiffer
7f2c122bcb Merge branch 'sam/staff-overhaul' into 'master' 
Staff Rework

Closes #767 and #762

See merge request veloren/veloren!1429
 2020-10-16 02:22:00 +00:00
Sam
fb2e94360d Made ability key not hardcoded in tool.rs. 2020-10-15 20:05:58 -05:00
Joshua Barretto
4f4dad3707 Merge branch 'UMR1352/fix#790' into 'master' 
Fix issue #790

Closes #790

See merge request veloren/veloren!1439
 2020-10-15 14:14:52 +00:00
Enrico Marconi
14ec1b4d2a Suggested edit 2020-10-15 14:47:29 +02:00
Enrico Marconi
57b66261f6 Reviewer's suggested edit 2020-10-15 14:36:59 +02:00
Enrico Marconi
4f7d0c8b5c Fix issue #790: hotbar working while ui is toggled off 2020-10-15 13:28:29 +02:00
Sam
90a1185096 Moved explsion struct from within comp to common. 2020-10-14 21:06:55 -05:00
Sam
fbd91918e7 Addressed playtesting feedback. 2020-10-14 21:06:52 -05:00