1284 Commits

Author SHA1 Message Date
Monty Marz
c5720c02c9 Basic UI
Basic ui for groups and group window
2020-08-08 01:12:35 +02:00
Imbris
cf0a727eb6 Add basic group functionality (no voxygen wiring yet) 2020-08-08 01:09:01 +02:00
nepo
b8cb8ec68b nepo/dullahan 2020-08-07 03:56:59 +00:00
Sam
2b6f4a1747 Removed commented code 2020-08-06 10:15:24 -05:00
Sam
fd745a4d11 Removed energy refund on M2 attacks. Re-added custom heights on creatures. Tweaked movement on triple strike. 2020-08-06 09:43:50 -05:00
Silentium2318
ab594a97fb More weapon and hit box tweaks 2020-08-06 09:43:47 -05:00
Silentium2318
36e464dbf3 Weapon balancing 2020-08-06 09:39:49 -05:00
Silentium2318
31a54ce99a Dis some distance and attack arc tweaking 2020-08-06 09:39:09 -05:00
Silentium2318
5a73d48e3b Weapon balancing 2020-08-06 09:38:22 -05:00
Imbris
8f813a3773 Revert "Merge branch 'BottledByte/ability_design' into 'master'"
This reverts merge request !1264
2020-08-06 08:04:03 +00:00
Imbris
703da622bb Merge branch 'BottledByte/ability_design' into 'master'
Add ability IDs and use them in GUI

See merge request veloren/veloren!1264
2020-08-06 04:44:51 +00:00
BottledByte
8cbb43ac30 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
b8199542e0 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar
Also fixed two wrong asset references and did some .ron formatting
2020-08-05 01:21:42 +02:00
BottledByte
4a19f1dacc De-enumerized armor variants 2020-08-03 03:41:32 +00:00
BottledByte
c7a5161b43 Removed fine-grained Item enums and replaced them with Strings
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
2020-08-02 01:21:32 +00:00
Samuel Keiffer
6f73713c79 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Snowram
b37c0962af Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
2645f9e631 cyclops run anim 2020-08-01 02:19:45 -04:00
jshipsey
654088820c maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
1b7cb8cde6 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
9a4415509c catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
8251fcfa55 new models, anim tweaks 2020-08-01 02:19:44 -04:00
Marcel Märtens
0713c1dd54 switch to auth that doesn't use agent 2020-07-31 01:05:01 +02:00
Marcel Märtens
e4eb380cdf update auth to newest version 2020-07-29 19:28:22 +02:00
Marcel Märtens
451b6fddef update auth to the newest version and remove useless dep 2020-07-29 00:05:23 +02:00
Samuel Keiffer
b41fff299f Bow charged shot attack 2020-07-26 03:06:53 +00:00
Samuel Keiffer
527453c54a Armor fixes 2020-07-25 23:57:04 +00:00
Monty Marz
6d3f0f2e29 lots of things
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
2020-07-23 12:10:13 +00:00
jshipsey
ae79ffc68d small fixes 2020-07-20 21:37:13 -04:00
Imbris
f4e286c087 Merge branch 'treeco/fix-spawn-damage' into 'master'
Reset rather than accumulate velocity when stuck or in unloaded chunks

See merge request veloren/veloren!1185
2020-07-18 19:08:40 +00:00
Imbris
6f5f799321 Remove gravity rather than reset velocity in unloaded chunks 2020-07-18 07:13:30 -04:00
Imbris
d6e96b3f49 Merge branch 'zesterer/winit-20' into 'master'
Upgrade winit to 0.22.2

See merge request veloren/veloren!788
2020-07-18 03:26:59 +00:00
Imbris
3a1f63cb4f Merge branch 'Menko/utility_items_fix_issue_612' into 'master'
#612 Fixed utility items not being removed from inventory/hotbar

See merge request veloren/veloren!1123
2020-07-18 02:41:45 +00:00
Nemanja
c3dce91088 #612 Fixed utility items not being removed from inventory/hotbar 2020-07-18 02:41:45 +00:00
Imbris
b583a0afce fix a few minor bugs 2020-07-17 21:24:28 -04:00
Imbris
71bb15189c Rearrange PlayState system to work without loop control 2020-07-17 21:24:28 -04:00
Samuel Keiffer
7c0f90e6b2 Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set. 2020-07-18 00:05:28 +00:00
lausek
ab29085b6d fix #611; add distance check when mounting pet 2020-07-15 14:54:53 +02:00
Joshua Barretto
1c1229fff9 Crafting 2020-07-14 20:11:39 +00:00
Joshua Barretto
25266923a9 Merge branch 'zesterer/small-fixes' into 'master'
Zesterer/small fixes

See merge request veloren/veloren!1190
2020-07-14 09:54:17 +00:00
Joshua Barretto
48391d4f99 Neater compass 2020-07-13 23:23:44 +01:00
Joshua Barretto
f14e91ca0f Added minimap compass 2020-07-10 15:00:20 +01:00
Joshua Barretto
33d035973d Improved hill path following 2020-07-10 00:43:11 +01:00
Songtronix
8745e3ca98 fix: use correct specs(-idvs) versions
related to torvus
2020-07-09 19:46:30 +02:00
Joshua Barretto
6dc897c874 Commented unused but potentially useful code 2020-07-09 16:54:10 +01:00
Joshua Barretto
4ede438825 Improved pathfinding tolerance and reliability 2020-07-09 16:54:10 +01:00
Treeco
e63d991a5d Reset rather than accumulate velocity when stuck or in unloaded chunks 2020-07-09 15:58:07 +01:00
Samuel Keiffer
44e6fe01f1 Different body types now have different health values and gain different amounts of healths on leveling. 2020-07-09 00:04:25 +00:00
Samuel Keiffer
736132e154 Spin attack for axe 2020-07-08 19:58:41 +00:00
Ben Frankel
51dc3629c8 Maintain character state when inventory is modified
If the mainhand slot is swapped out or dropped while the character is
wielding, the character will be set to idle (same behavior). However, if
an item is picked up or used; or a non-mainhand item is dropped; or two
non-mainhand items are swapped; the character state will not be set to
idle (new behavior).

Rationale for keeping the same behavior:

Swapping a weapon out while in a wielding state can put the player in a
barehanded wielding state, which would be inconsistent with the fact
that that state can't be entered by toggling wield while barehanded.

Rationale for setting the new behavior:

Setting character state to idle was originally added because "Interact"
was mapped to right mouse button, so picking up an item with RMB would
also activate secondary attack if the player was wielding during the
interaction. Now the default keybinding for "Interact" is E, so this
isn't a problem unless the player changes their keybinding to RMB.

In addition, setting character state to idle for any inventory
manipulation may cause players to fall out of glider unexpectedly.
2020-07-07 09:43:48 -07:00