Joshua Barretto
a2a3a20aad
Added ice to cold water
2021-12-20 18:03:52 +00:00
Joshua Barretto
78f76dde83
Added baubles to trees
2021-12-20 18:03:52 +00:00
Joshua Barretto
e3203080ed
Added Calendar for temporal events based on the real-world calendar
2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3
Merge branch 'Character-editting' into 'master'
...
Character editing
See merge request veloren/veloren!3059
2021-12-20 15:24:43 +00:00
ubruntu
59cb9ea7c2
Hide empty stats on item tooltips
2021-12-20 15:07:38 +00:00
ubruntu
333bc0bed8
Fix stat comparisons in item tooltips
2021-12-18 02:31:30 +00:00
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
8cf871f449
Edit log message as suggested
2021-12-13 18:54:30 +01:00
Benoît du Garreau
287896facd
Remove common_assets::path_of`
2021-12-13 18:17:23 +01:00
Dr. Dystopia
408fe1e6b6
Begin creating character editing
2021-12-13 01:13:33 +01: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
Marcel
de5ca67615
Merge branch 'evanmeek/friendly_error_message' into 'master'
...
Add friendly error message for override assets.
See merge request veloren/veloren!2983
2021-12-07 15:35:40 +00:00
Evan
6bc8bbb4ed
Add friendly error message for override assets.
2021-12-07 15:35:40 +00: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
724e3bcdfd
Merge branch 'capucho/tracing-bump' into 'master'
...
Bump tracing-subscriber to 0.3.2
See merge request veloren/veloren!3032
2021-11-27 11:11:47 +00:00
João Capucho
8b89903d57
Bump tracing-subscriber to 0.3.2
...
We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00: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
c0bf9503bd
Addressed review issues, added cloning docs to BodySpec::Manifests
2021-11-13 17:20:23 +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
Imbris
79afad626b
Merge branch 'socksonme/pushback_require_collider' into 'master'
...
Make the collider component be required for entity pushback
See merge request veloren/veloren!2954
2021-11-09 06:11:07 +00: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
