Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,415 Commits 151 Branches 18 Tags 2.1 GiB
593d8fa4b5
Commit Graph

3586 Commits

Author SHA1 Message Date
Sam
d86692c4fe Added in-memory persistence of ability sets per weapon kind pair. 2022-01-15 21:42:34 -05:00
Sam
cf724bd76c Initial UI work 2022-01-15 21:42:32 -05:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00
Tormod G. Hellen
3afa16bf03 Fix hotbar changing when sorting inventory. 
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
 2022-01-14 19:14:24 +01:00
Tormod G. Hellen
a33e6df303 Remove unused code. 2022-01-14 18:23:42 +01:00
jshipsey
475fc1631f akhlut 2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Maveth
c8f083aa44 Thank you clippy, very cool 2022-01-13 12:31:51 -06:00
Maveth
167c9b2113 Test for cyclic skill dependencies 2022-01-13 12:21:11 -06:00
Sam
8c2a484ee5 Addressed review comments. 2022-01-12 22:19:00 -05:00
Sam
e98edbcc7a Conversion of poise damage to health damage now scales depending on the poise state the target is in. 
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
 2022-01-12 22:18:59 -05:00
Sam
2e2e56661f Tweaked poise effects and thresholds. 2022-01-12 22:18:59 -05:00
Sam
f182eec611 Fixed bugs in piercing penetration and crushing poise damage calculations. 2022-01-12 22:18:58 -05:00
Sam
d1e1de3b14 Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage. 
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
 2022-01-12 22:18:58 -05:00
fetsorn
338dec41ab Fix typo "incase"->"in case" 2022-01-06 18:28:05 +00:00
Sam
2e09feb426 Tweaks to prompt dialog. 2022-01-03 19:55:06 -05:00
Sam
efbc5f9b75 UI notifying player that their skillset has been invalidated. 2022-01-03 19:55:06 -05:00
Sam
0a9f3381f5 Skill points now attempt to be earned as experience is added. 2022-01-03 19:55:05 -05:00
Sam
da78800047 Changed skill groups to be a hashmap instead of a vec. 2022-01-03 19:55:05 -05:00
Sam
6d2496b7de Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments. 2022-01-03 19:55:04 -05:00
Sam
8221336587 Addressed some review. 2022-01-03 19:55:04 -05:00
Sam
64c8321626 Made skill groups remain locked if skill to unlock them not acquired. 2022-01-03 19:55:03 -05:00
Sam
903c57b862 Persitence now tracks spent_exp as an additional point to potentially invalidate skills. 2022-01-03 19:55:03 -05:00
Sam
c8675eaf45 Added hash value to decide if we should invalidate persited skills and allow a respec. 2022-01-03 19:55:02 -05:00
Sam
356eae85a6 Skillsets now store an ordered vec of skills that is used to track order that skills were acquired in. 2022-01-03 19:55:01 -05:00
Sam
27dd7b4391 Refactored skills code. 2022-01-03 19:55:01 -05:00
Sam
c44c10718b Split skillset and skills into separate files. 2022-01-03 19:55:00 -05:00
Sam
fe45a158ed Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp. 2022-01-03 19:55:00 -05:00
DoctorKompot
0dba858ca9 fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files 2021-12-27 03:01:26 +02:00
Imbris
b255f0ee0f put Client::tick_network function behind feature, remove unnecessary cloning of deleted entity vecs in entity sync, move prepare_send hack that avoids locking during message serialization from send_fallible to send, add job.cpu_status par mode adjustment around parallel section 2021-12-26 12:04:08 -05:00
Imbris
6547a6bf5e Parallelize entity sync loop over regions. 2021-12-25 19:24:12 -05:00
Imbris
bf48bd5346 update toolchain to nightly-2021-12-19 2021-12-23 13:04:24 +01:00
Christof Petig
cbd2a422f3 Add Chrismas wreath (25% chance) and make the towns go wild with illumination 2021-12-20 18:06:58 +00:00
Christof Petig
201101c059 Add glowing christmas ornaments 2021-12-20 18:06:57 +00:00
UncomfySilence
065da20812 + Finished hat offsets for all races 
+ Villagers only wear christmas hat
+ Guards wear boreal_warhelm
+ Gave guards christmas color lanterns
+ Grave_robbers now wear hood and hood_dark too while also dropping them at a higher rate than previously.
+ Christmas event now starts at 20th and goes till 30th of december
+ item_image_manifest.ron manifest fix
+ Created a potential boss loot table which allows the player to get the winter_cap, the boreal_warhelm, polaris lantern, and more blue cheese.
+ Updated hood_dark with another index 17 layer to prevent hair clip.
 2021-12-20 18:06:21 +00:00
UncomfySilence
e70fd8d397 + Added Gemu models 
+ Created manifest files for each
+ Created stats and other needs
+ Changed Event date from (24..=25) to (20..=30)
 2021-12-20 18:06:19 +00:00
Joshua Barretto
17e7879777 Added surface traction factor 2021-12-20 18:03:52 +00:00
Joshua Barretto
6e97e3179d Slippery ice 2021-12-20 18:03:52 +00:00
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
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
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
e7b92789f9 Refactor some of the terrain collision code, failed pre-emptive liquid check experiment 2021-10-10 02:42:06 -04:00
Imbris
8987f6128e Do iteration check for snapping after checking the other conditions 2021-10-10 02:42:06 -04:00
Imbris
798e02b9e5 Convert water/walls check to the new iteration function 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
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
e8021fab2c Cleaned up shrub implementation 2021-10-05 00:02:03 +01:00
Joshua Barretto
3b66af468a Improved river and lake banks 2021-10-05 00:02:03 +01:00
Joshua Barretto
826aff2ea4 Better lake entrances and distance 2021-10-05 00:02:03 +01:00
Joshua Barretto
f118d15745 Fixed oceans 2021-10-05 00:02:03 +01:00
Joshua Barretto
87c7d6e982 Improved river/lake rendering 2021-10-05 00:02:03 +01:00
Joshua Barretto
bfbca3e517 Added sail boat 2021-10-05 00:02:03 +01:00
Imbris
c8b55d3dcb Improve the warning message when USERDATA_STRATEGY was not set during compilation and the binary was moved outside the workspace/crate that it was compiled from, show a warning when an invalid VELOREN_USERDATA_STRATEGY is used, and also actually make sure warnings from userdata selection are logged in voxygen (since the userdata folder needs to be selected to set up logging we have to rerun the selection after logging is set up so that any warnings will be logged). 2021-10-04 12:23:42 -04:00
Sam
2dceadaebb Created csv export tool to get all item drops from an entity 2021-10-02 12:08:40 -04:00
Benoît du Garreau
ef1c51332d Update assets_manager to 0.6.0 2021-10-01 21:13:01 +02:00
Samuel Keiffer
f7161c1859 Merge branch 'sam/loot' into 'master' 
Refactored loot table selection on entity death

See merge request veloren/veloren!2879
 2021-10-01 07:06:10 +00:00
Sylvain Migaud
9b41568881 Place date at the begining of the log file name 2021-09-30 06:09:30 +00: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
943e7cd0e1 Fix csv tools for loot tables 2021-09-27 15:09:22 +03:00
juliancoffee
9c2fc0d962 Adress review 
- Mention failed loot specifier during getting item from lottery
 2021-09-27 15:09:22 +03:00
juliancoffee
8af4cf1a37 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
juliancoffee
ac5ea0cfe8 Hardened Loot handling part two 
+ clippy advices
+ use LootSpec::Nothing for basic_summon explicitly
 2021-09-27 15:09:22 +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
Marcel Märtens
2a82405df2 update toolchain to nightly-2021-09-24 2021-09-24 23:18:07 +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
heydabop
e2f9237f05
Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction 2021-09-23 10:05:12 -05: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
5838a84568 Consolidates projectile offsets into utils 2021-09-22 03:05:57 +02:00
Snowram
9c2ce83430 Set projectile offsets in states instead of globally 2021-09-22 01:07:09 +02: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
Marcel Märtens
88685cc016 update crates 2021-09-20 14:39:01 +02:00
Joshua Barretto
e098a38d8e Merge branch 'james/rrt-pathfinding' into 'master' 
Initial RRT flight pathfinding

See merge request veloren/veloren!2773
 2021-09-19 19:30:31 +00:00
Joshua Barretto
f94d579c04 Merge branch 'juliancoffee/clay_gole_laser_fix' into 'master' 
Tweak coefficient of beam_offset for clay_golem

See merge request veloren/veloren!2859
 2021-09-18 17:36:08 +00:00
juliancoffee
1d8c368137 Tweak coefficient of beam_offset for clay_golem 2021-09-18 19:55:46 +03:00
Ben Wallis
d665ce329d * Added new Admin Commands window to egui, including Give Items and Kits sections 
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
 2021-09-18 16:17:42 +01:00
Joshua Barretto
2f1fe39e04 Merge branch 'james/lava-dungeons' into 'master' 
Prettier site2 houses

See merge request veloren/veloren!2852
 2021-09-18 14:58:42 +00: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
James Melkonian
36884d6919 Move rrt algorithm into its own function 2021-09-17 16:27:00 -07:00
James Melkonian
9875a74640 Make RRT pathfinding a cfg feature 2021-09-17 16:01:20 -07:00
James Melkonian
c2c4429750 Disable RRT pathfinding 2021-09-17 16:01:19 -07:00
James Melkonian
7ddc229728 Initial RRT flight pathfinding 2021-09-17 16:01:19 -07:00
James Melkonian
42fdf0818d Gable primitive and dungeon lava rooms 2021-09-17 15:45:26 -07: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
82f3c3c3e8 is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer 2021-09-17 10:34:20 -07:00
anomaluridae
6362df4ffc keep MAX_TARGET_RANGE within voxygen 2021-09-17 10:34:20 -07:00
anomaluridae
42d5836cfa properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds. 2021-09-17 10:34:20 -07: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
19f0cf4ee5 Set z_min to 0 for terrain collision checks 
This allows us have different z_min for e2e checks
 2021-09-17 13:28:34 +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
3dd6aa9dea Implement capsule2capsule collisions 2021-09-17 13:28:34 +03:00
juliancoffee
fdb4b7111a Fix bug with zero-pushback for bigger colliders 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
7d97fe7ec5 Fix colliding bugs 
- Make cylinder-like capsules prisms work without NaN in origin offsets.
Just return p0 as both origins instead of getting NaN by further
normalizing required because of how we rotate offsets.
- Fix pushback direction.
Make sure that pushback is calculated as our_pos - their_pos (and not
other way around).
- Fix colliding boundary detection.
Calculate center as Vec3::new(0, 0, height) and
not as `Vec3::new(0, height, 0)`.
 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
44962958d8 Adress feedback 
- Rewrite 2 * PI to TAU
- Some comment formatting
 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
7712976b86 Refactor box_voxel_collision function 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
Sam
99981338bb Fixed exp fix mistake and fixed lava, campfire, and bomb damage. 2021-09-15 08:32:44 -04:00
Sam
3d31248ced Fixed health ui in few places and xp scaling from health. 2021-09-14 10:55:14 -04: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
Sam
c7291701e1 Sprite interaction fixes 2021-09-07 20:34:04 -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
juliancoffee
670e29a286 Better formatting 2021-09-04 20:56:55 +03:00
juliancoffee
3cf9d0cdb0 Adress review: 
- explanation of what pvp/pve means in /battlemode help
- check for radius from town instead of town in chunks (because it count
  plant fields, which is kinda meh)
- better error displaying
 2021-09-04 20:38:53 +03:00
Sam
f65b3a094d Cultists now properly raid villages. 2021-09-04 12:25:04 -04:00
juliancoffee
43d40c4efc Workaround of bug with global Player component 
* Set default value of battle_mode and last_battlemode_change explicitly
if isn't found in battlemode_buffer
 2021-09-04 02:29:02 +03:00
juliancoffee
1baa9e9879 Add in-memory persistence for battlemode changes 2021-09-04 01:41:48 +03: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
2e79c61123 Implement /battlemode_force command 
+ add placeholder for /battlemode command (currently can only show your
  battle mode)
 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
Sam
0a3b541940 Removed ability to 'droideka' through dungeons. 2021-09-02 19:48:30 -04:00