1037 Commits

Author SHA1 Message Date
Imbris
62be9ec225 Merge branch 'ubruntu/system-independent-itempaths' into 'master'
Ubruntu/system independent itempaths

See merge request veloren/veloren!1538
2020-11-21 04:08:12 +00:00
ubruntu
b0aa0574a1 Ubruntu/system independent itempaths 2020-11-21 04:08:11 +00:00
Imbris
dcdfde18dc Merge branch 'imbris/fix-apple-bug' into 'master'
Fix issues with not being able to grab highlighted apples by unifying distance checking

Closes #820

See merge request veloren/veloren!1532
2020-11-21 02:55:09 +00:00
Imbris
925a7af09c Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module 2020-11-20 20:51:44 -05:00
jiminycrick
41d3322fb2 Initial work to move combat sfx to outcomes 2020-11-18 13:31:12 -08:00
jiminycrick
9c2f8100a3 Made level up sounds use outcomes instead of emitting an event 2020-11-18 13:31:12 -08:00
Imbris
8d02ebf61e Fix issues with not being able to grab highlighted apples by unifying distance checking 2020-11-17 23:06:02 -05:00
Snowram
39479863f5 Addressed more comments 2020-11-17 23:54:01 +01:00
Snowram
9966f08e78 Addressed comments 2020-11-17 23:27:13 +01:00
Snowram
4034f7e790 Move eye sight and scale in body.rs, mounts tweaks 2020-11-17 23:27:13 +01:00
Ben Wallis
4730b5f023 Moved waypoint persistence to new waypoint column on stats table 2020-11-17 07:51:50 +00:00
Imbris
3bf9cac0e6 Temp fix for the home command 2020-11-15 20:40:12 -05:00
Sam
2f22deefda Campfires can no longer be yeeted by arrows. 2020-11-15 11:13:03 -06:00
Joshua Barretto
3fc9f6221a Merge branch 'treeco/home-removes-waypoint' into 'master'
Made home command reset waypoint to world spawn

See merge request veloren/veloren!1520
2020-11-15 02:12:12 +00:00
Imbris
610e74e7e7 Merge branch 'imbris/save-selected-char' into 'master'
Save the selected character, deselect character when deleting, auto select newly created character

See merge request veloren/veloren!1516
2020-11-15 01:40:44 +00:00
Treeco
4ed20a8b8d Made home command reset waypoint to world spawn 2020-11-15 01:06:27 +00:00
Imbris
dab3f01c20 Save the selected character, deselect character when deleting, auto select newly created character 2020-11-14 19:17:42 -05:00
Imbris
a5a51b91ef Send ability map from the server to the client on connection instead of loading from the assets 2020-11-14 16:07:07 -05:00
Ben Wallis
896a703717 Fixed character data not being persisted on character switch 2020-11-14 13:36:54 +00:00
Sam
479bda3895 Fixed tests. Addressed comments. 2020-11-13 10:41:34 -06:00
Sam
0752157935 Speed and power on weapons are now able to modify abilities after they are loaded from ron files. 2020-11-12 21:24:36 -06:00
Imbris
c42bdc3641 Remove ability map from top level functions 2020-11-12 21:24:35 -06:00
Sam
275deabae9 Started moving loading of ability manifest to an ecs variable. 2020-11-12 21:24:34 -06:00
Joshua Barretto
27821c3aed Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins 2020-11-09 10:20:22 +00:00
Christof Petig
e288677af0 Make waypoints persistent
Closes #549
2020-11-08 22:15:47 +01:00
Christof Petig
7ef0636614 Patch for the position de-synchronization by imbris
See https://discordapp.com/channels/449602562165833758/449650240350453760/774724295452393522
2020-11-08 18:56:55 +01: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
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
Imbris
db6eeaeb6c Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
76db4b338d Yeeted from manifest files. 2020-11-07 15:53:14 -06:00
AlKabir
ee64934c94 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +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
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
c9b3b5b904 Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Snowram
1b1e322a1a Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
97b988a747 Roll now gives i-frames. 2020-11-05 16:48:04 -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
Sam
e2c8a0f665 Fixed crash from changes in explosion code. 2020-11-04 22:21:02 -06:00
Sam
90e8b1f504 Addressed comments. 2020-11-04 19:22:08 -06:00
Sam
a9e34739ed Removed Damages struct. Added GroupTarget enum. Changed RadiusEffect to use Effect instead of Daamges. Added Damage variant to Effect Eenum. 2020-11-04 19:22:07 -06:00
Sam
07766a6e6c Energy and health change server events now reference EcsEntity instead of Uid. Added TargetGroup to use to determine targets of effects/damage. Added Entity(TargetGroup, Effect) to RadiusEffect enum. 2020-11-04 19:22:06 -06:00
Sam
e34f5f09e9 Addressed comments. 2020-11-04 19:22:05 -06:00
Sam
be2f376176 Separated out health from stats component. 2020-11-04 19:22:04 -06:00
Sam
099933bf2a Added energy change server event. 2020-11-04 19:22:01 -06:00
Sam
b63a13bef1 Changed explosions to take a vec of RadiusEffects. Changed Damage to a struct of DamageSource and value. Added interpolation function to damage. 2020-11-04 19:22:00 -06:00
Joshua Barretto
870ec8e9f7 Merge branch 'christof/home_town' into 'master'
implement /home to return to home town

See merge request veloren/veloren!1481
2020-11-04 15:58:35 +00:00