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,728 Commits 151 Branches 18 Tags 2.1 GiB
fae3cf2521
Commit Graph

5728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
20ee9c77f6 Merge branch 'nward/debug-hud-frame-time' into 'master' 
Address issue #808: Add Frame Time in DebugInfo

See merge request veloren/veloren!1448
 2020-10-23 02:01:50 +00:00
NathanW
7e92e21f8b Address issue #808: Add Frame Time in DebugInfo 2020-10-22 16:42:10 -06:00
Forest Anderson
14b5d01af3 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
ff57d2a79d Merge branch 'zesterer/clouds' into 'master' 
Clouds

See merge request veloren/veloren!1442
 2020-10-21 21:05:26 +00:00
Joshua Barretto
2237500743 Clouds 2020-10-21 21:05:25 +00:00
Forest Anderson
709cef2665 More small fixes 2020-10-21 19:02:59 +00:00
Forest Anderson
4d22b93863 Some fixes by @Jurre 2020-10-21 18:45:00 +00:00
Forest Anderson
f79e13135e Added Dutch translation, created by @Namp007 2020-10-21 13:39:36 -04:00
Justin Shipsey
9d19a2ec63 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
da7a3454bf Merge branch 'xMAC94x/netfixC' into 'master' 
xmac94x/netfixc

See merge request veloren/veloren!1440
 2020-10-19 15:24:07 +00:00
jiminycrick
b98e2a924d Fixed hammer AI and added axe AI 2020-10-19 16:20:59 +02:00
Snowram
34ce8bb042 Addressed comments 2020-10-19 16:20:59 +02:00
jiminycrick
64ef7f39d6 Addressed comments on agent code 2020-10-19 16:20:59 +02:00
jshipsey
c74133740e remove commented code 2020-10-19 16:20:59 +02:00
Snowram
d5e60d93b4 Add missing biped_large anims 2020-10-19 16:20:59 +02:00
jshipsey
9c003cf572 bipedlarge hammer fixes 2020-10-19 16:20:59 +02:00
jshipsey
64d73abdec roshwalr fix 2020-10-19 16:20:59 +02:00
jshipsey
caa048b1d5 small fixes 2020-10-19 16:20:59 +02:00
Snowram
7a62ddfd3f Add BeastClaw npc weapontype 2020-10-19 16:20:59 +02:00
Snowram
f9383e4dd8 Add roshwalr npc 2020-10-19 16:20:59 +02:00
jiminycrick
be1596a703 fixed agent code for staff rework 2020-10-19 16:20:59 +02:00
jshipsey
66b1fe67dc rebase 2020-10-19 16:20:58 +02:00
Snowram
c9985e14cb Rename Saurok, various anim fixes 2020-10-19 16:20:58 +02:00
jshipsey
6a86567301 fix agent bug 2020-10-19 16:20:58 +02:00
jshipsey
65df398672 werewolf work 2020-10-19 16:20:58 +02:00
jiminycrick
50aac17d94 Added secondary skills to agent code (except bow) 2020-10-19 16:20:58 +02:00
Snowram
6c54e6d8fe Add sand, snow and wood raptor npcs 2020-10-19 16:20:58 +02:00
Snowram
588f66a1ee Add treant npc 2020-10-19 16:20:58 +02:00
Snowram
290adcfad8 Standardizes character bone names 2020-10-19 16:20:58 +02:00
Snowram
58e2d3a4ad More bipedlarge anim work 2020-10-19 16:20:58 +02:00
Snowram
c1c2c9dc07 Add bipedlarge spin and beta anims 2020-10-19 16:20:58 +02:00
unknown
94cbe3faf4 Better bipedlarge weild, charge and shoot anims 2020-10-19 16:20:58 +02:00
unknown
d2f91bc3a0 Assigns a ToolKind to bipedlarge weapons 2020-10-19 16:20:58 +02:00
jshipsey
0e628ef67f rebase fix 2020-10-19 16:20:58 +02:00
Snowram
0a9ec848a7 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
4dcd450382 Add beast attributes 2020-10-19 16:20:57 +02:00
Snowram
a4f4fa38e2 Improve bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
f4a068c422 Initial bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
204fa50de9 Add werewolf npc 2020-10-19 16:20:57 +02:00
Marcel Märtens
b5f48014a9 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
572b83e262 add a try_recv fn to Stream which is NOT async 2020-10-19 10:23:27 +02:00
Justin Shipsey
ab411406b0 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
80b863da3b Fix #793 2020-10-18 11:03:02 +02:00
Marcel
f6692aee74 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
b5a969862a 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
e6684009c2 Made ability key not hardcoded in tool.rs. 2020-10-15 20:05:58 -05:00
Joshua Barretto
8617b17569 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
af0542db90 Suggested edit 2020-10-15 14:47:29 +02:00
Enrico Marconi
d85473bccf Reviewer's suggested edit 2020-10-15 14:36:59 +02:00
Enrico Marconi
9c184b60e4 Fix issue #790: hotbar working while ui is toggled off 2020-10-15 13:28:29 +02:00