Commit Graph

5866 Commits

Author SHA1 Message Date
Sam
08a0926c40 Fixed sneaky admin sword. 2020-11-08 13:58:23 -06:00
Christof Petig
b11da85ff9 Patch for the position de-synchronization by imbris
See https://discordapp.com/channels/449602562165833758/449650240350453760/774724295452393522
2020-11-08 18:56:55 +01:00
Justin Shipsey
8cab21d44c Merge branch 'AlKabir/animals-dont-drop-lootbags' into 'master'
Make different mobs drop different assets on death (not just lootbags)

See merge request veloren/veloren!1462
2020-11-08 07:26:10 +00:00
Justin Shipsey
86aa7f7ba2 Merge branch 'james/unique-weapon-fix' into 'master'
Asset ron file fix for Unique NPC weapons after de-stringifying ToolKind

See merge request veloren/veloren!1494
2020-11-08 06:55:50 +00:00
AlKabir
9424ecfb4d centering assets 2020-11-08 00:35:11 -06:00
jiminycrick
66dbfebf3b Asset ron file fix 2020-11-07 22:06:08 -08:00
AlKabir
aaac3dadcb improved the steak asset 2020-11-07 23:52:18 -06:00
AlKabir
4803ee5c81 changed to an or operand 2020-11-07 23:37:15 -06:00
AlKabir
6535deae9c added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
AlKabir
0bf437f2b1 Merge branch 'AlKabir/animals-dont-drop-lootbags' of https://gitlab.com/veloren/veloren into AlKabir/animals-dont-drop-lootbags 2020-11-07 22:51:10 -06:00
AlKabir
289126d9c8 Make different mobs drop different assetts on death (not just lootbags) cargo fmt 2020-11-07 22:50:38 -06:00
AlKabir
134c481408 Make different mobs drop different assetts on death (not just lootbags) 2020-11-07 22:50:38 -06:00
Samuel Keiffer
d523ed7216 Merge branch 'sam/fix-typo-from-yeet-weapon-string' into 'master'
Typo Fix in Asset Manifest File

See merge request veloren/veloren!1493
2020-11-08 04:45:57 +00:00
Samuel Keiffer
245caa1e78 Merge branch 'sam/stupid-fix-2' into 'master'
Other stupid fix

See merge request veloren/veloren!1492
2020-11-08 04:04:41 +00:00
Sam
aeca76c748 Fixed cultist sword not displaying correctly in inventory. 2020-11-07 21:48:24 -06:00
Sam
158fb36420 Other stupid fix. 2020-11-07 21:07:53 -06:00
Samuel Keiffer
131d2fefbb Merge branch 'sam/stupid-fix' into 'master'
Fixed stupid error.

See merge request veloren/veloren!1491
2020-11-08 02:45:46 +00:00
Sam
b4296c3a2c Fixed stupid error. 2020-11-07 19:54:37 -06:00
Samuel Keiffer
7a35490043 Merge branch 'sam/yeet-weapon-strings' into 'master'
Removes weapon strings from ToolKind

See merge request veloren/veloren!1489
2020-11-08 00:38:50 +00:00
Imbris
133ba82a9b Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
4ae946d699 Fix audio tests. 2020-11-07 15:53:19 -06:00
Sam
8adee6ef20 Added Tool() around file paths in other manifest. 2020-11-07 15:53:19 -06:00
Sam
261ebf3990 Added Tool() around file paths. 2020-11-07 15:53:18 -06:00
Sam
d484ac2e38 Yeeted from ron files. 2020-11-07 15:53:16 -06:00
Sam
ca65cdace1 Yeeted from manifest files. 2020-11-07 15:53:14 -06:00
Sam
a4046872b2 Yeeted from code files. 2020-11-07 15:53:10 -06:00
Justin Shipsey
2000ba587e Merge branch 'AlKabir/issue785-small-aiming-change' into 'master'
Minor combat fixes (see issue 785)

See merge request veloren/veloren!1461
2020-11-07 18:00:07 +00:00
AlKabir
77f3c7e3c5 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
Samuel Keiffer
2370100e83 Merge branch 'tbg/#785' into 'master'
Removed ToolCategory, changed in_fluid to in_liquid

See merge request veloren/veloren!1475
2020-11-06 15:33:20 +00:00
TheBoredProgrammer64
b2ec207979 Revert "Removed toolCategory"
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +00:00
Marcel
d0ed0d5773 Merge branch 'xMAC94x/small-ci' into 'master'
ci cleanup, dependency update

See merge request veloren/veloren!1485
2020-11-06 14:23:52 +00:00
Marcel Märtens
40f5afc2b0 ci cleanup, dependency update 2020-11-06 14:34:42 +01:00
Samuel Keiffer
44f676d90c Merge branch 'sam/make-roll-great-again' into 'master'
Roll overhaul

See merge request veloren/veloren!1484
2020-11-06 03:25:18 +00:00
Samuel Keiffer
45e6fd5ad9 Merge branch 'snowram/consumables-buffs' into 'master'
Allows for consumables to have an optional array of buffs and effects

See merge request veloren/veloren!1472
2020-11-06 02:42:34 +00:00
Sam
37ecb165ef Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox. 2020-11-05 20:40:20 -06:00
Snowram
262ceac060 fmt 2020-11-06 01:08:35 +01:00
Monty Marz
642ad805a1 potion buff 2020-11-06 01:08:34 +01:00
Snowram
4b439e9b58 Adresses comment 2020-11-06 01:08:34 +01:00
Snowram
0d92f02deb Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Monty Marz
ca932f6c15 easier to get minor potions
increase cost of a minor potion to 4 apples
2020-11-06 01:08:32 +01:00
Monty Marz
eb79820c25 tweaks consumables buffs values 2020-11-06 01:08:32 +01:00
Snowram
a52f83e92c Addresses some comments 2020-11-06 01:08:31 +01:00
Snowram
ce96af4363 Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
66850a5878 Fixed audio tests. Added changelog line. 2020-11-05 18:01:46 -06:00
Sam
4a1a3f3ecc Roll now gives i-frames. 2020-11-05 16:48:04 -06:00
jshipsey
fae3ef6e59 roll anim speedup 2020-11-05 16:40:30 -05:00
Sam
860c766d62 Changed roll movement. 2020-11-05 14:22:30 -06:00
Sam
55e75adec0 Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment. 2020-11-05 12:28:18 -06:00
Marcel
121364821a Merge branch 'xMAC94x/FeuerzeugBierflasche' into 'master'
xMAC94x/feuerzeugBierflasche

See merge request veloren/veloren!1478
2020-11-05 09:22:50 +00:00
Marcel Märtens
a7ce3e5a2e switch back to cylindric entity <-> entity collision check.
I still doubt why we do cylindric vs cylindric in entity <-> entity check,  but box vs box in entity <-> terrain check.
Though i did a spheric calculation here.
The cylindric one is alot slower though, 500 entities take 1.9s instead of 1.3s
2020-11-05 08:54:10 +01:00