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
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
socksonme
2ef668a16c
removed unnecessary self
2021-10-29 15:23:49 +03:00
socksonme
42ed5c43f5
fixed code quality
2021-10-29 15:01:21 +03:00
socksonme
584e379e40
Removed beams and shockwaves from phys.rs
...
calc_z_limit doesn't use an Opyion anymore, construct_spacial_grid also doesn't check for beams or shockwaves, collider_other in apply_pushback is also required now and resolve_e2e_pushback also doesn't use Options anymore.
2021-10-29 09:43:01 +03: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
socksonme
052e09039a
Made the pushback cache require colliders
2021-10-19 15:05:30 +03: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
