Youssef Fahmy
871859b09b
Smol balance changes
2021-11-16 22:45:59 +00:00
Marcel
82c867d95e
Merge branch 'xMAC94x/airship_voxels_common' into 'master'
...
move server.voxel for airship to common
See merge request veloren/veloren!3012
2021-11-15 23:29:58 +00:00
Marcel Märtens
086f9737e4
move server.voxel for airship to common
2021-11-15 16:39:39 +01:00
Marcel
3801ead342
Merge branch 'tim74' into 'master'
...
fix(AppData): Update screenshots due 404
See merge request veloren/veloren!2834
2021-11-15 12:44:01 +00:00
Marcel
e218ec2b44
Merge branch 'xMAC94x/fix_torvus_and_other_client_only' into 'master'
...
move ship_manifest to common assets until its properly included in servers ECS...
See merge request veloren/veloren!3009
2021-11-15 09:16:03 +00: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
Samuel Keiffer
dd52695917
Merge branch 'solved_orc_beard_mystery' into 'master'
...
Oolnokk/ "Goatee" orc beard glitched fixed
See merge request veloren/veloren!3005
2021-11-14 04:11:30 +00:00
Oolnokk
5643cea4ba
The long orc beard was painted with index 17 thus rendering parts invisible after the hat update, creating an infamous 'goatee' look. Copied the colors to much higher indexes, and now it looks as intended ingame.
2021-11-13 19:08:06 -05:00
Joshua Barretto
b1915622b5
Merge branch 'xvar/fix-tooltip-floating-point-rounding' into 'master'
...
Added formatting to round tooltip values for consumables to 1 decimal place
See merge request veloren/veloren!3004
2021-11-13 20:54:05 +00:00
Ben Wallis
8d356d14a3
Merge branch 'xvar/exp-sharing' into 'master'
...
Implemented EXP sharing based on damage contribution
See merge request veloren/veloren!2986
2021-11-13 20:46:45 +00: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
Ben Wallis
b4c7af1ad1
Added formatting to round tooltip values for consumables to 1 decimal place
2021-11-13 20:25:09 +00:00
Joshua Barretto
4b3aa7e8fa
Merge branch 'zesterer/fun-things' into 'master'
...
Fun Things
See merge request veloren/veloren!2987
2021-11-13 17:49:20 +00:00
Joshua Barretto
c0bf9503bd
Addressed review issues, added cloning docs to BodySpec::Manifests
2021-11-13 17:20:23 +00:00
Joshua Barretto
0f56ebe82b
Toned down golf club knockback
2021-11-13 17:13:09 +00:00
Joshua Barretto
657ac45288
Updated changelog
2021-11-13 17:13:09 +00:00
Joshua Barretto
db741fe4c0
Added waypoints to towns
2021-11-13 17:13:09 +00:00
Joshua Barretto
46ec4203a2
Arbitrary volume airships
2021-11-13 17:13:08 +00:00
Joshua Barretto
026a4a07bb
Made explosions bonk sprites
2021-11-13 17:12:17 +00:00
Joshua Barretto
edf9c59e7d
Added bomb sprites
2021-11-13 17:12:16 +00:00
Joshua Barretto
dbfbdcdacd
Added golf club
2021-11-13 17:11:02 +00:00
Joshua Barretto
006edb9298
Merge branch 'Oolnokk/wanderers_hat_capitalization_fix_3' into 'master'
...
Oolnokk/wanderers hat capitalization fix 3
See merge request veloren/veloren!3002
2021-11-13 17:01:50 +00:00
Benjam Soule H. Walker
9011ed3a77
Update assets/voxygen/voxel/armor/misc/head/wanderers_hat.vox
2021-11-13 16:30:03 +00:00
Justin Shipsey
32e3161d33
Merge branch 'Oolnokk/three_new_hats_edited_and_approved_by_gemu' into 'master'
...
Three new hats. Models have been cleaned up and approved by Gemu.
See merge request veloren/veloren!2998
2021-11-13 04:02:40 +00:00
Oolnokk
de0072bbc1
Fixed drop chances in village crates to better resemble prior odds
2021-11-12 19:52:09 -05:00
Oolnokk
a71f2204d9
Changed drop location from boars to T2 Chests
2021-11-12 19:34:57 -05:00
Oolnokk
c6383ca5a4
Models have been cleaned up and approved by Gemu
2021-11-12 18:46:01 -05: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
b901b97191
Changed fallback ability icon.
2021-11-11 23:41:01 -05:00
Sam
040d70c750
Final fixes.
2021-11-11 23:11:17 -05: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
Imbris
ee6b8b6828
Merge branch 'imbris/leak-fix' into 'master'
...
Potential fix for leak when inventory is open
See merge request veloren/veloren!2995
2021-11-10 22:15:25 +00: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
a7e1d3218f
Potential fix for leak when inventory is open
2021-11-09 01:21:45 -05:00
Imbris
38a50d175c
Merge branch 'socksonme/fix_item_drop_texture' into 'master'
...
Temporary fix to the textures of dropped items
See merge request veloren/veloren!2993
2021-11-09 06:12:17 +00:00
Socksonme
0a4df2b158
Temporary fix to the textures of dropped items
2021-11-09 06:12:16 +00: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
Joshua Barretto
9866befac4
Merge branch 'lilypads' into 'master'
...
Jungles and Rivers update
See merge request veloren/veloren!2978
2021-11-08 22:51:22 +00:00
DemonicOnPc
b7ac542ebb
fixes to branch after my whoops
2021-11-08 17:09:19 -05:00
DemonicOnPc
a9cedee277
Update scatter.rs
2021-11-08 17:09:17 -05:00
DemonicOnPc
7fc57c027b
Fixes to jungle sprites and lillypads
2021-11-08 17:09:15 -05:00
DemonicOnPc
c6dd425203
Update sprite_manifest.ron
2021-11-08 17:09:12 -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
