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

5359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
jshipsey
0cc203bbb1 clippy 2020-10-14 21:06:35 -05:00
jshipsey
26b93b347e anims 2020-10-14 21:06:32 -05:00
Sam
0b8558ba73 Balance tweaks to staff abilities. 2020-10-14 20:57:01 -05:00
Monty Marz
45f78876b0 new staff skill icons 2020-10-14 20:56:58 -05:00
Sam
62723e1279 Ai for staff-wielding enemies. Keyframes for shockwave state. 2020-10-14 20:56:24 -05:00
Sam
6672b5cd91 Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles. 2020-10-14 20:56:23 -05:00
Sam
f546bea809 Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second. 2020-10-14 20:56:22 -05:00
Sam
42d5e91540 Reworked explosions. Tweaked staff fireball. 2020-10-14 20:56:21 -05:00
Sam
70839bdd42 Flamethrower particles. 2020-10-14 20:56:21 -05:00
Sam
a4f5dc589e Started to add particles. 2020-10-14 20:56:20 -05:00
Sam
2a157168f2 Initial implementation of new staff abilities. 2020-10-14 20:56:16 -05:00
Samuel Keiffer
92ed8d275b Merge branch 'james/hammer-axe-bow-skillz' into 'master' 
Add 3rd skill for hammer, bow, and axe

Closes #766, #765, and #764

See merge request veloren/veloren!1399
 2020-10-15 01:34:53 +00:00
jiminycrick
6221245e57 Consolidated recover code in repeater_ranged 2020-10-14 17:10:27 -07:00
jiminycrick
30a01df013 Fixed clippy errors and added SFX 2020-10-14 15:30:58 -07:00
jiminycrick
76e63840ec Skill icons with proper rotation 2020-10-14 12:50:33 -07:00
jiminycrick
f6ce3f1957 Responded to testing feedback 2020-10-14 12:50:33 -07:00
jshipsey
40da71bfaf energy values, remove hotload 2020-10-14 12:50:33 -07:00