Marcel Märtens
d24b904563
move ship_manifest to common assets until its properly included in servers ECS and pushed to clients
2021-11-15 09:00:12 +01:00
Ben Wallis
022c1417b6
EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies).
...
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.
EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
2021-11-13 20:46:45 +00:00
Joshua Barretto
657ac45288
Updated changelog
2021-11-13 17:13:09 +00:00
Joshua Barretto
46ec4203a2
Arbitrary volume airships
2021-11-13 17:13:08 +00:00
Sam
f65c89862c
Removed vec allocation with an impl Iterator.
2021-11-11 22:43:25 -05:00
Sam
a288f9ee43
Addressed further review.
2021-11-11 22:37:37 -05:00
Sam
dfcb8c8519
Addressed review feedback.
2021-11-11 18:10:22 -05:00
Sam
b678f7f46e
Added some client methods for changing abilities to hook into.
2021-11-11 01:55:32 -05:00
Sam
da677e8ea6
Abilities can now be referred to by the asset id.
2021-11-10 17:30:19 -05:00
Sam
4309e1ff9b
Did voxygen stuff for ability pool.
2021-11-09 21:20:41 -05:00
Sam
d33ff9f17e
Ability pool updates after switching weapons now.
2021-11-09 19:51:06 -05:00
Sam
a8bec0280c
Ability pool mostly functional.
2021-11-09 12:56:07 -05:00
Oolnokk
b67558c1ba
2 new beards, four new hairstyles and 1 new eye option for dwarf males
2021-10-31 22:58:25 -04:00
Sam
560f73d296
Addressed review feedback.
2021-10-31 16:39:47 -04:00
Sam
41effe61d0
Being knocked out of item use or sprite interact states forces a poise state.
2021-10-29 19:24:40 -04:00
Sam
57851b7df3
Fixed buff applied.
2021-10-29 17:37:10 -04:00
Sam
f339793911
Buffed staff firebomb a little.
2021-10-29 17:37:07 -04:00
Sam
2b447852fd
Added min fall off to explosions.
2021-10-29 17:37:02 -04:00
Sam
fbd742abdb
Changed crafting to only consume items after checking that the crafting would be successful instead of consuming items first and reinserting on failure.
2021-10-27 17:02:36 -04:00
Sam
4b9e9c506b
Fixed opening salvaging station not showing salvage text.
2021-10-27 17:02:35 -04:00
Sam
6ff7317e05
Added function that returns the output of salvaging an item when result just needs to be checked.
2021-10-27 17:02:32 -04:00
Sam
9fc3a9bf01
Fixed item path of leather items under hide folder.
2021-10-27 17:02:32 -04:00
Sam
356057afc4
Added comments in areas that were lacking.
2021-10-27 17:02:31 -04:00
Sam
794b072d3e
Simple recipes now take a vec of slots to look in for the ingredients.
2021-10-27 17:02:30 -04:00
Sam
111abbc3bc
Added salvage tags to items, removed old salvage recipes from recipe book.
2021-10-27 17:02:29 -04:00
Sam
ed5cf8ebf9
Backend stuff for salvaging.
2021-10-27 17:02:29 -04:00
Sam
cac3f00250
Lengendary crit changes.
2021-10-26 20:55:32 -04:00
Sam
4d4b7e846a
Haha, nerfs go brr
2021-10-26 18:44:45 -04:00
Joshua Barretto
37056e75f9
Merge branch 'demonic/shrubs' into 'master'
...
Added new Spots, Shrubs and Ships.
See merge request veloren/veloren!2953
2021-10-26 10:06:14 +00:00
DemonicOnPc
a74af55c46
Gemu's Revamped vox models added.
2021-10-26 05:28:05 -04:00
Justin Shipsey
434913b946
Merge branch 'kemper/sand-shark-hitbox' into 'master'
...
Better sand shark hitbox
See merge request veloren/veloren!2956
2021-10-24 22:03:08 +00:00
Kemper
b96c6c94ab
Adjust sand shark hitbox
2021-10-24 21:04:46 +00:00
DemonicOnPc
b1476071b1
Added new Spots, Shrubs and Ships.
...
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.
Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs
Galleon ship added
2021-10-24 08:10:44 -04:00
ubruntu
e6bfce99bb
Use stealth stat on armors
2021-10-24 05:31:49 +00:00
Bryant Deters
b2bd43f4d3
Sneak with weapons drawn
2021-10-18 14:53:55 -05:00
Joshua Barretto
c397bfa69f
Merge branch 'socksonme/refactor_villageralarm' into 'master'
...
Socksonme/refactor villageralarm
See merge request veloren/veloren!2931
2021-10-17 12:47:19 +00:00
Sam
c5c70f6945
Correctly took dot product, switched to square root of dot product
2021-10-15 22:41:53 -04:00
Sam
7b2ade34c4
Removed angle between with dot product in handle_orientation.
2021-10-15 17:26:10 -04:00
socksonme
c631341da9
Refactored SoundKind and UtteranceKind
2021-10-15 22:49:25 +03:00
Imbris
f61d742d29
Fix NaNs
2021-10-15 13:17:13 -04:00
Imbris
e67c688c11
Add test for Ori::angle_between
2021-10-15 12:02:53 -04:00
Imbris
c412a96d6a
Fix issue with angle between going over PI and remove faulty test (angle between Quaternions isn't equivalent to the angle between Dir vectors since Quaternions involve rolling as well)
2021-10-15 03:20:40 -04:00
Imbris
aa1ffa9f61
Remove timings and commented code (separate from the previous commit so we can keep these notes in the git history), add potentially better version of the straight up/down case for to_horizontal as a comment for testing in the future, remove fine grained spans
2021-10-15 01:38:56 -04:00
Imbris
b0bd8cdb45
Improve Ori impl of From<Dir> and Ori::to_horizontal by avoiding acos/asin calls by constructing the quaternions in a more direct fashion
2021-10-15 01:23:00 -04:00
Imbris
457ed6ac64
Remove per entity VecDeque's of events from character StateUpdate and instead pass in external Vecs that can be pushed to (saves significant time not allocating for VecDeque::new)
2021-10-15 01:23:00 -04:00
Imbris
43e743c2bc
Rewrite Ori::to_horizontal to reduce redundant normalization and directly calculate the needed yaw instead of using the more general Ori::from(dir), fix bugs in Ori::from(dir) and optimize the up/down case, add tests for Ori::to_horizontal and Ori::angle_between
2021-10-15 01:23:00 -04:00
Imbris
d515b42eac
Improve efficiency of states::utils::handle_orientation by reducing the conversions between Ori/Dir less frequent and optimizing the conversion of Dir -> Ori, also added a method to compute the angle between two Ori so that they don't need to be converted to Dir
2021-10-15 01:23:00 -04:00
Henry Corse
e01ce2dcf4
Kaedr/pretty printing error messages
2021-10-14 18:37:51 +00:00
Sam
1e3b0dcd16
Fix block energy cost being multiplied by 10 and also slightly reduce it.
2021-10-13 10:02:28 -04:00
Imbris
f65399eb00
Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation
2021-10-10 02:42:07 -04:00
ubruntu
0e2808a8fd
Interactable campfires
2021-10-05 00:55:29 +00:00
Joshua Barretto
2ae7bca9c0
Rebalanced boat speed
2021-10-05 00:02:03 +01:00
Joshua Barretto
c6d3137612
Fixed sail boat thrust, removed dead water code, added comments
2021-10-05 00:02:03 +01:00
Joshua Barretto
bfbca3e517
Added sail boat
2021-10-05 00:02:03 +01:00
Benoît du Garreau
ef1c51332d
Update assets_manager to 0.6.0
2021-10-01 21:13:01 +02:00
juliancoffee
68aba856ec
Cleaning
2021-09-27 23:21:57 +03:00
juliancoffee
7291d32209
Make ItemDrop component with Item again
2021-09-27 20:36:18 +03:00
juliancoffee
b056cccb0c
Hardened loot table handling
...
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
2021-09-27 15:09:22 +03:00
Sam
09dd9b4813
Changed ItemDrop to use LootSpec
2021-09-27 15:09:22 +03:00
Marcel
cea927efb6
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
update toolchain to `nightly-2021-09-24`
See merge request veloren/veloren!2862
2021-09-26 19:25:02 +00:00
Samuel Keiffer
ea2fa5f110
Merge branch 'sam/cr-weights' into 'master'
...
Changed weights of cr calculation and exp from cr formula.
See merge request veloren/veloren!2875
2021-09-26 18:21:56 +00:00
Sam
c62162c2d3
Changed weights of cr calculation and exp from cr formula.
2021-09-25 21:52:20 -04:00
Sam
942376f88c
Made poise a float at interface of module.
2021-09-25 14:07:47 -04:00
Marcel Märtens
e36eef99c8
apply some clippy fixes that comes with the new toolchain version
2021-09-24 23:18:18 +02:00
Sam
0e5e2b46f2
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-23 14:11:09 -04:00
Joshua Barretto
bee5b232e6
Fixed crash caused by invalid health, stated current <= maximum invariant more clearly
2021-09-23 12:36:03 +01:00
Snowram
cf6bf74f7a
Set beam offset depending on body dimensions
2021-09-21 15:31:46 +02:00
Snowram
7a73e4240b
Bird large beam offset hack
2021-09-21 15:31:43 +02:00
jshipsey
1ad107f4a7
animation tweaks
2021-09-21 15:30:43 +02:00
jshipsey
aedb2e9d2b
wyvern walk
2021-09-21 15:30:43 +02:00
Snowram
834749353a
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
Justin Shipsey
02c19aaee8
Merge branch 'zesterer/remove-unscheduled-skydives' into 'master'
...
Remove unscheduled skydives
See merge request veloren/veloren!2851
2021-09-18 04:53:22 +00:00
Joshua Barretto
a76496c339
Use previous position caches for airship collision detection
2021-09-17 22:34:28 +01:00
Imbris
bc4455afe4
Merge branch 'anomaluridae/cleanup-interactable' into 'master'
...
Seperation of targets vs interactables. Cleaner cursor interactions.
See merge request veloren/veloren!2754
2021-09-17 19:25:08 +00:00
anomaluridae
5c66f73bb4
make the ContollerInputs.select_pos be explicitly the breakable blacks for mining
2021-09-17 10:34:20 -07:00
juliancoffee
f810af4eec
Rename EntityInfo level field to health_scaling
2021-09-17 20:12:42 +03:00
juliancoffee
e5d69d153b
Adress review
...
Make sausage ascii-art have `a` line inside of stadium
2021-09-17 13:28:34 +03:00
juliancoffee
4e3fb87526
Adress review
...
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
with p0=p1=Vec2::zero())
2021-09-17 13:28:34 +03:00
juliancoffee
c069a3523d
Fix beam offsets
...
- Introduce notion of min and max radius for Body instead of old
`radius()` function (which is renamed to `max_radius()`).
2021-09-17 13:28:34 +03:00
juliancoffee
eeb3bec8ad
Refactor implementation of e2e collision
...
+ Add some hopefully helpful comments
+ Extract colliding tries to separate function
+ Move to Capsule + Cylinder collider combination instead of Capsule +
Capsule.
2021-09-17 13:28:34 +03:00
juliancoffee
d86c9f2678
Remove body::Shape enum, make npc use CapsulePrism
2021-09-17 13:28:34 +03:00
juliancoffee
6c3b61dc25
Implement CapsulePrism collisions
2021-09-17 13:28:34 +03:00
juliancoffee
3b308a3f6f
Add CapsulePrism collider variant
...
+ Add placeholder physics collision implementation as copy of cylinder
Box collider.
+ Display it with debug hitboxes.
2021-09-17 13:28:34 +03:00
Samuel Keiffer
73d3d3e4bb
Merge branch 'sam/health-float' into 'master'
...
Turned Health into a Float
See merge request veloren/veloren!2824
2021-09-13 15:23:18 +00:00
Sam
fec92c3000
Fixed plugin tests with hack.
2021-09-13 10:34:40 -04:00
Sam
85f4e66337
Addressed MR 2824 comments
2021-09-10 15:20:14 -04:00
Monty Marz
1d94adc2e1
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
42012fddcb
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04:00
Joshua Barretto
003b9f57ce
Merge branch 'juliancoffee/pvp_command' into 'master'
...
Implement /battlemode command and more
See merge request veloren/veloren!2787
2021-09-04 18:37:01 +00:00
Sam
f65b3a094d
Cultists now properly raid villages.
2021-09-04 12:25:04 -04:00
juliancoffee
fbe745fe1e
Cooldowns
...
- Add last_battlemode_change to Player component
- check on last_battlemode_change in handle_battlemode
- set last_battlemode_change after setting battlemode
- still are not persisted in any way
2021-09-04 01:41:48 +03:00
juliancoffee
338e81de10
Deduplicate pvp-checks
2021-09-03 17:28:34 +03:00
juliancoffee
6b0d016418
Don't forget about pets in PvP checks
2021-09-03 17:28:34 +03:00
Marcel
970d57f905
Merge branch 'juliancoffee/skill_boost_rework' into 'master'
...
ECS & Diary info synchronization
See merge request veloren/veloren!2771
2021-09-02 16:04:23 +00:00
ubruntu
bbc366e1b3
NPCs can drop nothing
2021-09-01 23:17:36 +00:00
Knightress Paladin
f49dc2191d
Make parrying refund the block stamina cost and cancel the recover animation
2021-08-31 23:46:33 -07:00
Sam
538cb56b87
Sprites now go through a character state to be picked up.
2021-08-31 13:36:04 -04:00
Joshua Barretto
0b1a820762
Make arrows 'bonk' hanging sprites
2021-08-31 13:31:27 +01:00
juliancoffee
9211b4a00a
Inline skills::Boost to voxygen code
2021-08-26 14:49:52 +03:00
juliancoffee
54cb990d52
Move to one SKILL_MODIFIERS constant
2021-08-26 14:49:52 +03:00
