Samuel Keiffer
9684fe09b7
Merge branch 'holychowders/allow_most_npcs_to_flee_again' into 'master'
...
Re-allow and Improve Agents' Fleeing
See merge request veloren/veloren!2950
2021-12-16 01:12:03 +00:00
Benoît du Garreau
aca088388b
Update assets_manager to 0.7
2021-12-12 22:11:47 +01:00
James Melkonian
5f6d1c3438
Convert Armor Stats to Options
2021-12-12 00:25:35 +00:00
holychowders
b40d94dd53
Re-allow and improve fleeing.
2021-12-07 20:18:03 -06:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Dr. Dystopia
f4c5abf36b
Resolve all '#[allow(clippy::needless_range_loop)]' error supressions
2021-12-03 10:38:30 +01:00
Imbris
7760210824
Remove redundant closures
2021-11-28 12:24:57 -05:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +01:00
Marcel Märtens
e29ede7c97
updating dependencies,
...
cannot update the following dependencies:
- vek: Sharps SIMD isnt upstream
- tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
- refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
- equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
- wgpu: cant update due new version doesnt support DX11
Got quinn updated which now require some dependencies to be explicit.
2021-11-20 20:17:49 +01:00
Kemper
d37dbf5d24
Adjust hitboxes for husk and medium birds
...
The hitbox of the husk did not include the head and the hitboxes
of the medium birds were far too wide.
2021-11-19 06:18:13 +00:00
Marcel Märtens
086f9737e4
move server.voxel for airship to common
2021-11-15 16:39:39 +01:00
Marcel Märtens
cd516d0912
name it just manifests rather then tmp_manifests
2021-11-15 09:47:38 +01:00
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
Joshua Barretto
edf9c59e7d
Added bomb sprites
2021-11-13 17:12:16 +00:00
Samuel Keiffer
6e57380735
Merge branch 'sam/ability-pool-and-hotbar' into 'master'
...
Ability pool
See merge request veloren/veloren!2996
2021-11-12 05:11:12 +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
DemonicOnPc
7fc57c027b
Fixes to jungle sprites and lillypads
2021-11-08 17:09:15 -05:00
DemonicOnPc
9514cd71c6
Jungle and River update
...
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
2021-11-08 17:09:11 -05:00
Joshua Barretto
e3ab8fc8ce
Added rtsim merchants to site2
2021-11-01 22:19:49 +00:00
Joshua Barretto
8e2ca9cdec
Added rtsim villagers to site2 towns
2021-11-01 22:19:49 +00: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
Samuel Keiffer
e692f49463
Merge branch 'sam/potion-tweaks' into 'master'
...
Potion tweaks
See merge request veloren/veloren!2976
2021-10-31 21:12:08 +00:00
Sam
560f73d296
Addressed review feedback.
2021-10-31 16:39:47 -04:00
jshipsey
c2b7d3bb44
good hat rendering
2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5
switch to new matcell variant
2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac
support for hollow voxels ty zesterer
2021-10-30 23:42:14 -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
ca292a53ea
All aspects of an attack now scale with the modifier.
2021-10-29 17:37:12 -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
Monty Marz
727295aec1
text and alignment WIP
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
Monty Marz
7aae35f286
bench
2021-10-27 17:02:31 -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
Kemper
b0b90744cf
Add a range limit to trading
...
Prevents initiating trades with client-side ghosts.
2021-10-25 00:47:45 +00: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
Joshua Barretto
3357008601
Merge branch 'zesterer/small-fixes' into 'master'
...
Caverns
See merge request veloren/veloren!2763
2021-10-16 09:33:57 +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
4b2842da2f
Merge branch 'imbris/opt-phys-2.0' into 'master'
...
Make terrain physics faster with internal iteration
See merge request veloren/veloren!2915
2021-10-11 14:52:46 +00:00
juliancoffee
b5d9e4e4a9
Fix Traveller names
...
- Previously RtSim were created with automatic name for body generated
from EntityConfig, not from RtSim body. Now RtSim body is set for
EntityConfig.
2021-10-11 15:06:43 +03:00
Samuel Keiffer
05b85a00e2
Merge branch 'sam/wiki-all-entities' into 'master'
...
Csv export entity drops tool now has ability to export all entities at once.
See merge request veloren/veloren!2910
2021-10-10 16:56:46 +00:00
Sam
fc787d150e
Now stores a column for entity path to more easily allow searching for what drops a particular item in the future
...
Fixed excel perceiving certain csv entries as a date
2021-10-10 12:37:16 -04:00
Joshua Barretto
086097cd56
Better vines and lighting
2021-10-10 13:41:57 +01:00
Joshua Barretto
353ccc5bce
Added new cavern sprites to caverns
2021-10-10 13:41:57 +01:00
Monty Marz
14ed73ec12
cavern sprites
2021-10-10 13:41:56 +01:00
Joshua Barretto
bfc55d7b17
More cavern details
2021-10-10 13:41:56 +01:00
Joshua Barretto
5c0026f4a7
Performance improvements for terrain watcher
2021-10-10 13:41:56 +01:00
Joshua Barretto
1cfad833c7
Added caverns, fixed chunk load performance issue
2021-10-10 13:41:56 +01:00
Imbris
4f6eb286e6
Remove dead commented code, updated changelog, commented profiling spans
...
(but left in for easy reuse later), fix clippy complaint
2021-10-10 03:09:03 -04:00
Imbris
57922d9802
Rearrange iteration pattern so that x is in the inner loop in the default for_each_in (no or little perf change)
2021-10-10 02:42:07 -04:00
Imbris
11c8cf19d1
Switch to for loops in default for_each_in (small perf increase), add inline to sprite methods (no perf change)
2021-10-10 02:42:07 -04:00
Imbris
5777486f5c
Remove custom for_each_in from Chonk
2021-10-10 02:42:07 -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
Imbris
2350c08e91
Try marking VolGrid2d::for_each_in and friends as inlineable
2021-10-10 02:42:07 -04:00
Imbris
3a4c45f045
Try marking Chonk::for_each_in and related functions as inlineable
2021-10-10 02:42:07 -04:00
Imbris
7f6ba90f59
simplify water/walls check code, interally iterate in chonks (but not
...
chunks)
2021-10-10 02:42:06 -04:00
Imbris
59bd5b4acd
Initial iterator optimization by using internal iteration at the vol_grid level, water/walls not switched over yet
2021-10-10 02:42:06 -04:00
Imbris
8987389e8a
Submit chunk requests to the generator within the terrain system right before receiving new chunks, so that duplicate work is not done for chunks that just finished but were not yet added to the terrain.
2021-10-08 16:17:31 -04:00
Sam
53c9dfcd92
Csv export entity drops tool now has ability to export all entities at once.
2021-10-07 20:28:18 -04:00
Treeco
dafa1327d0
Added mottled bark to birch
2021-10-06 02:26:43 +01:00
Samuel Keiffer
aaaf59d672
Merge branch 'sam/wiki-loot' into 'master'
...
Created csv export tool to get all item drops from an entity
See merge request veloren/veloren!2892
2021-10-05 15:45:22 +00:00
Sam
b7e2e27000
Now outputs item names instead of item asset paths.
2021-10-04 21:46:19 -04:00
