Marcel Märtens
735774b5c2
adjust path to veloren account page
2020-11-09 09:21:14 +01:00
Justin Shipsey
84d7af1ee8
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
db70c8cec5
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
435c2b9bda
centering assets
2020-11-08 00:35:11 -06:00
jiminycrick
37335078ed
Asset ron file fix
2020-11-07 22:06:08 -08:00
AlKabir
13b76e1891
improved the steak asset
2020-11-07 23:52:18 -06:00
AlKabir
1cfa96e830
changed to an or operand
2020-11-07 23:37:15 -06:00
AlKabir
f5e5511057
added two meat assets for mobs to drop
2020-11-07 23:34:20 -06:00
AlKabir
2b3684ccbd
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
568743d75d
Make different mobs drop different assetts on death (not just lootbags) cargo fmt
2020-11-07 22:50:38 -06:00
AlKabir
362e84c631
Make different mobs drop different assetts on death (not just lootbags)
2020-11-07 22:50:38 -06:00
Samuel Keiffer
faf0578d50
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
1b06b48952
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
eb028de936
Fixed cultist sword not displaying correctly in inventory.
2020-11-07 21:48:24 -06:00
Sam
6879c880fe
Other stupid fix.
2020-11-07 21:07:53 -06:00
Samuel Keiffer
7d9a18a91b
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
a8d02bf2ce
Fixed stupid error.
2020-11-07 19:54:37 -06:00
Samuel Keiffer
21ae7b867d
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
db6eeaeb6c
Use item_definition_id for weapon asset mapping
2020-11-07 16:44:11 -06:00
Sam
13be252f58
Fix audio tests.
2020-11-07 15:53:19 -06:00
Sam
afb405350e
Added Tool() around file paths in other manifest.
2020-11-07 15:53:19 -06:00
Sam
4ddb9878b4
Added Tool() around file paths.
2020-11-07 15:53:18 -06:00
Sam
ce32437ee1
Yeeted from ron files.
2020-11-07 15:53:16 -06:00
Sam
76db4b338d
Yeeted from manifest files.
2020-11-07 15:53:14 -06:00
Sam
e392e37c47
Yeeted from code files.
2020-11-07 15:53:10 -06:00
Justin Shipsey
055e341449
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
ee64934c94
Minor combat fixes (see issue 785)
2020-11-07 18:00:07 +00:00
Samuel Keiffer
849e90ad06
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
d195eaf701
Revert "Removed toolCategory"
...
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +00:00
Marcel
b9fc903cd1
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
77bbc44051
ci cleanup, dependency update
2020-11-06 14:34:42 +01:00
Samuel Keiffer
df8567c5a9
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
f4dade7957
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
bd6acca55c
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
4f6aae5459
fmt
2020-11-06 01:08:35 +01:00
Monty Marz
8da2871897
potion buff
2020-11-06 01:08:34 +01:00
Snowram
4c30dadf47
Adresses comment
2020-11-06 01:08:34 +01:00
Snowram
c9b3b5b904
Buff stonegolem, nerf giants, add missing sfxs
2020-11-06 01:08:33 +01:00
Monty Marz
b0a6e8a043
easier to get minor potions
...
increase cost of a minor potion to 4 apples
2020-11-06 01:08:32 +01:00
Monty Marz
491fb7c85c
tweaks consumables buffs values
2020-11-06 01:08:32 +01:00
Snowram
a2671123e5
Addresses some comments
2020-11-06 01:08:31 +01:00
Snowram
1b1e322a1a
Allow for an arbitrary array of effects and buffs for consumables
2020-11-06 01:08:30 +01:00
Sam
34156f2cfa
Fixed audio tests. Added changelog line.
2020-11-05 18:01:46 -06:00
Sam
97b988a747
Roll now gives i-frames.
2020-11-05 16:48:04 -06:00
jshipsey
5ede5e0116
roll anim speedup
2020-11-05 16:40:30 -05:00
Sam
47c442423e
Changed roll movement.
2020-11-05 14:22:30 -06:00
Sam
d5bbe761ae
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
0fdbf4a488
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
c3669138d7
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
Samuel Keiffer
9b058ffc83
Merge branch 'sam/smol-fixes' into 'master'
...
Small Fixes 2
See merge request veloren/veloren!1471
2020-11-05 05:19:12 +00:00
