Commit Graph

4109 Commits

Author SHA1 Message Date
Sam
014a8cce61 Combo melee can now optionally not function as a stance 2022-10-27 20:06:31 -04:00
Sam
66f9cf22fc Balanced abilities and insert ability id into animations. 2022-10-27 20:06:30 -04:00
Sam
aea4a43b65 Placeholder abilities 2022-10-27 20:06:30 -04:00
Sam
38094b6ba2 Finisher melee 2022-10-27 20:06:29 -04:00
Sam
057b1a4ad6 Added capability for attacks to be interrupted by dodging or blocking 2022-10-27 20:06:29 -04:00
Sam
c09e858cba Single target melee attacks now hit the closest target instead of a random target. 2022-10-27 20:06:28 -04:00
Sam
1e0dfe003d Rolling can now only interrupt abilities when in buildup 2022-10-27 20:06:28 -04:00
Sam
7b27b63122 Melee attacks now only hit a single target by default 2022-10-27 20:06:28 -04:00
Sam
af39287331 Added support for abilities being cheaper if activated from the correct stance 2022-10-27 20:06:27 -04:00
Sam
0ff06edcdc Combo melee skips recover if continuously striking. Combo animations consolidated to one file. 2022-10-27 20:06:27 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master'
Halloween event

See merge request veloren/veloren!3668
2022-10-25 21:37:34 +00:00
Samuel Keiffer
f676e732f6 Merge branch 'flaffwaffle/action_state_concurrent_states' into 'master'
ActionState extensions to allow for multiple concurrent state variables And More Complex AI

See merge request veloren/veloren!3659
2022-10-25 03:21:46 +00:00
Timothy Finnegan
1922d69154 Ran Cargo fmt 2022-10-24 19:52:37 -07:00
flo666
9b1efe1bee clippy, fmt, remove leftover file, fix sitenames in soundtrack 2022-10-25 00:33:23 +02:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
kitswas
c83ec87d6a Code cleanup 2022-10-24 22:05:11 +05:30
kitswas
e29a9f4e36 Colour reflects old poise state 2022-10-24 22:05:11 +05:30
kitswas
b21764c99f Added tick mark for the upcoming threshold 2022-10-24 22:05:11 +05:30
kitswas
be586aa84f Extracted hard-coded poise thresholds to a constant 2022-10-24 22:05:11 +05:30
Tim Finnegan
a21a674ed1 Merge branch 'master' into 'flaffwaffle/action_state_concurrent_states'
# Conflicts:
#   CHANGELOG.md
2022-10-24 01:35:25 +00:00
James Melkonian
6bacb487f3 Bat AI 2022-10-23 20:05:39 +02:00
flo666
586d0f6dd8 add bat (created by Gemu) 2022-10-23 20:05:39 +02:00
flo666
79e6fd58fe - make tricksters spawn in groups and play instruments
- remove defunct draugr flee
2022-10-23 20:05:39 +02:00
flo666
e1bd385408 make draugrs Npcs flee at health below 100%,
trickster gear,
single spawns (trickster, dullahan),
2022-10-23 20:05:39 +02:00
IsseW
1d6b7d6a03 Add Halloween event 2022-10-23 20:05:39 +02:00
flo
698a00bae3 savannah_pit 2022-10-22 19:48:50 +00:00
holychowders
7502cd664a Have agents update awareness of targets.
This is preliminary and has no visible effect.
2022-10-21 20:25:54 -05:00
holychowders
f45c465c75 Add new Awareness struct. 2022-10-20 11:36:29 -05:00
holychowders
bc20744cd3 Remove old unused awareness stuff. 2022-10-20 11:36:16 -05:00
Timothy Finnegan
a9add7012e Added support for multiple timers, conditions, and counters in a single action node. 2022-10-16 19:48:27 -07:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +00:00
Joshua Barretto
3c54e63592 Various minor optimisations 2022-10-12 13:57:14 +01:00
Isse
536bb9b71c Merge branch 'zesterer/citadel' into 'master'
Two new tree types and disabled citadel site.

See merge request veloren/veloren!3652
2022-10-10 16:19:48 +00:00
James Melkonian
99d547c7c6 Add unit test to validate recipe keys 2022-10-09 20:50:09 -07:00
Joshua Barretto
0b5d043d8e Began work on citadel 2022-10-09 23:23:39 +02:00
Avi Weinstock
e6576f0cf3 Make the trading AI for pets only accept food. 2022-09-30 15:11:03 -04:00
Avi Weinstock
60f5383f8b Address comments for MR 3633. 2022-09-30 14:51:49 -04:00
Avi Weinstock
c62bc0dd0d Allow pets to be traded with. 2022-09-30 14:51:49 -04:00
Marcel Märtens
0fe0192a2d get rid of string replacements in template strings 2022-09-29 17:33:53 +02:00
Marcel Märtens
a0ef3be9ac remove hardcoded localisation from client 2022-09-27 13:46:12 +02:00
Marcel
17c940e0f8 Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `2022-09-23`

See merge request veloren/veloren!3615
2022-09-25 19:44:58 +00:00
Marcel Märtens
1e1ee5031f remove enum_iterator with strum, fixes #1723 2022-09-25 16:09:46 +02:00
Marcel Märtens
cf6a764aa4 update toolchain to 2022-09-23 2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1 update toolchain to 2022-09-08
This reverts commit 6c9deee491.
This reverts commit a32b269252.
2022-09-24 00:04:40 +02:00
Marcel Märtens
29d0f5b25d update dependencies 2022-09-22 11:57:55 +02:00
Samuel Keiffer
59d8d287d9 Merge branch 'seachapel_npc_work' into 'master'
seachapel npc work

See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99 seachapel npc work 2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff Merge branch 'sharp/parallel-ingame' into 'master'
Parallelize ingame messages.

See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
1c14ec7ee1 Parallelize ingame messages. 2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90 Remove persistence loading error from SkillSet.
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server.  It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Samuel Keiffer
188db01a7b Merge branch 'sam/hot-agent' into 'master'
Agent combat tactics hot reloading

See merge request veloren/veloren!3629
2022-09-21 02:44:51 +00:00
Imbris
1b48a3008c Merge branch 'Couls/TestBed' into 'master'
Extend item pickup UI to group members

Closes #1402

See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55 Extend item pickup UI to group members 2022-09-20 22:13:50 +00:00
Sam
3d6c9a780d Removed redundant package parameter from init function of hot reloading 2022-09-17 00:55:28 -04:00
Sam
cfeb197f85 Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead. 2022-09-17 00:50:59 -04:00
Sam
23c51af437 Consolidated voxygen and server dynlibs into a common dynlib 2022-09-16 23:43:26 -04:00
Christof Petig
5d8a708d6b Merge branch 'juliancoffee/loot_export_fix' into 'master'
Make loot export display all modulars

See merge request veloren/veloren!3598
2022-09-16 21:55:59 +00:00
Joshua Yanovski
e9a463d459 Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
cafdcad8ce Merge branch 'sharp/improve-msg' into 'master'
Improve some server system performance

See merge request veloren/veloren!3614
2022-09-15 04:30:31 +00:00
Joshua Yanovski
2c15d0af56 Reduce overhead of messaging systems. 2022-09-14 21:04:53 -07:00
Marcel
725fd09ed7 Merge branch 'yusdacra/nix' into 'master'
!2951 with fixed runtime panic

See merge request veloren/veloren!3605
2022-09-14 10:12:07 +00:00
flo
dc688bccb9 fix_salamander_and_elbst 2022-09-13 17:32:53 +00:00
juliancoffee
be1638e2e7 Remove csv_import of loot table 2022-09-12 18:30:17 +03:00
juliancoffee
97900b109f Make loot export display all modulars 2022-09-12 18:30:17 +03:00
Joshua Yanovski
aea4aca057 Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master'
Xmac94x/steal sharps clippy improvements

See merge request veloren/veloren!3612
2022-09-11 19:56:35 +00:00
Marcel Märtens
a32b269252 steal sharps clippy improvements to the old nightly 2022-09-11 16:10:56 +02:00
flo
e43608ce80 add guitar & instrument sample edits 2022-09-10 17:23:38 +00:00
Joshua Yanovski
986d104faa Update Rust toolchain. 2022-09-08 15:43:53 -07:00
Marcel Märtens
d9e6f10688 update dependencies 2022-09-08 23:29:08 +02:00
Yusuf Bera Ertan
812298cb63
fix: default to build detected git version / tag if we can't get runtime variables 2022-09-08 12:29:17 +03:00
Yusuf Bera Ertan
58e74a26cd
Revert "Merge branch 'revert-441acd3e' into 'master'"
This reverts commit f170da4da6, reversing
changes made to aa7569061b.
2022-09-08 12:28:56 +03:00
Joshua Yanovski
e55b541bcc Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Samuel Keiffer
aa7569061b Merge branch 'juliancoffee/more-buffs' into 'master'
Add Golden Cheese debug potion

See merge request veloren/veloren!3597
2022-09-08 01:01:18 +00:00
Joshua Yanovski
c95c08ee54 Merge branch 'sharp/fix-full-server' into 'master'
Allow mods/admins to log in when server is full.

See merge request veloren/veloren!3600
2022-09-07 05:21:08 +00:00
Joshua Yanovski
f5aee1d2a7 Allow mods/admins to log in when server is full.
As a side effect, this moves the initial game server sync message into
the login code, since that's the first place we can check for admin
permissions and we want to avoid sending large messages to users who are
not authenticated (especially if the player cap has been reached;
previously, the player cap check limited the damage that could be done
by unauthenticated players).

Some fallout from this is that we don't synchronize the Player component
anymore, which had some minor effects on voxygen.  This update also
breaks Torvus, since Client::new now expects the username and password
to be provided from the getgo--an accompanying MR will be submitted to
fix it.
2022-09-06 21:42:31 -07:00
Imbris
441acd3e48 Merge branch 'yusdacra/chore/nix' into 'master'
build(nix): refactor and update nix flake

See merge request veloren/veloren!2951
2022-09-07 03:42:28 +00:00
juliancoffee
34c5e95d8a Add Energy regen buff
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
2022-09-06 15:50:04 +03:00
juliancoffee
54c48c7112 Extract buff executor into own function 2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef Merge branch 'creature_model_updates' into 'master'
Creature model updates

See merge request veloren/veloren!3584
2022-09-06 10:35:11 +00:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
juliancoffee
2b3cfe690d Adress review
* Make compatible_handndess check its own function and get back to
  `match`
2022-09-06 00:59:15 +03:00
juliancoffee
421aa44d5f Make kit generate all possible modulars 2022-09-05 00:24:58 +03:00
juliancoffee
0c5a33b031 Add functions to generate collection of modulars 2022-09-05 00:24:58 +03:00
Yusuf Bera Ertan
e94acbec8b
fix: use as_str to get rid of doesn't implement display 2022-09-03 16:31:52 +03:00
Yusuf Bera Ertan
2af2b34d84
build: allow common to read git version information at runtime 2022-09-03 16:26:10 +03:00
Joshua Barretto
6a1e560906 Switched to median dt for stable dt 2022-09-02 18:21:24 +01:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
Samuel Keiffer
52ce12f383 Merge branch 'floppy-music-instruments' into 'master'
Music Instruments

See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032 Music Instruments 2022-08-28 18:48:18 +00:00
Joshua Yanovski
6032dbd22a Merge branch 'seachapel_fixes' into 'master'
seachapel_fixes

See merge request veloren/veloren!3572
2022-08-27 08:03:04 +00:00
flo666
1876d169c8 - Dagon, SeaCrocodile hitboxes 2022-08-27 08:06:33 +02:00
Imbris
4126194a5c View distances small fixes and improvement:
* Properly set view_distance field in Client when sending it to the
  server in request_character/request_spectator.
* Removed invalid check I had included in Client::set_view_distance
* ViewDistances::clamp now clamps min to 1 for both types of view distance.
2022-08-25 23:24:43 -04:00
Imbris
cc1de8334d Clean up common/src/lib.rs to avoid repetitive wasm cfgs. Not many lines
actually removed but it looks a lot better IMO.
2022-08-25 23:24:43 -04:00
Imbris
334937568e Add an entity view distance setting that allows limiting the distance
entities are synced from and displayed in.

NOTE: Syncing entities work at the granularity regions which are
multi-chunk squares but the display of entities in voxygen is limited in
a circle with the radiues of the supplied distance.

Additional details and changes:
* Added `ViewDistances` struct in `common` that contains separate
  terrain and entity view distances (the entity view distance will be
  clamped by the terrain view distance in uses of this).
* View distance requests from the client to the server now use this
  type.
* When requesting the character or spectate state the client now passes
  its desired view distances. This is exposed as a new parameter on
  `Client::request_character`/`Client::request_spectate`. And the client
  no longer needs to send a view distance request after entering these
  states. This also allows us to avoid needing to initialize `Presence`
  with a default view distance value on the server.
* Removed `DerefFlaggedStorage` from `Presence` and `RegionSubscription` since the
  change tracking isn't used for these components.
* Add sliders in voxygen graphics and network tabs for this new setting.
  Show the clamped value as well as the selected value next to the
  slider.
* Rename existing "Entities View Distance" slider (which AFAIK controls
  the distance at which different LOD levels apply to figures) to
  "Entities Detail Distance" so we can use the former name for this new
  slider.
2022-08-25 23:24:43 -04:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
Joshua Barretto
51d90707b5 Relaxed automod somewhat 2022-08-23 10:03:06 +01:00
Imbris
275b17be57 Merge branch 'imbris/misc_fix' into 'master'
Trade canceling related tweaks, make kill_npcs not leave clutter (and actually remove entities in the first place), and misc tweaks

See merge request veloren/veloren!3555
2022-08-21 16:35:16 +00:00
DaforLynx
656727ecbd Miscellaneous audio fixes 2022-08-21 05:32:02 +00:00
Imbris
ca66a9f79b Fix bug in Health::kill that caused Destroy event to never be emitted by preemptively setting is_dead to true 2022-08-20 18:47:09 -04:00
Marcel
3b87bf1e4a Merge branch 'xMAC94x/slowjob_freeze_reproduction' into 'master'
Initial reproduction of the slowjob freezen with par_iter and slowjob,

See merge request veloren/veloren!3546
2022-08-20 20:44:07 +00:00
juliancoffee
69cea513ee Make comments to be doc-comments 2022-08-20 22:30:25 +03:00
juliancoffee
6319dcfc22 Add more components in /body
* Add mass
* Add density
* Add collider.
This one is strange as always, I don't know what's wrong, but debug hitbox
changes only after death. Real one seems to work.
2022-08-20 17:02:08 +03:00
juliancoffee
a371aad05e Add /body command that allows you to switch body 2022-08-20 15:20:27 +03:00
Marcel Märtens
3eac68000b all tests shows there is currently no way to keep rayon from work-stealing over scopes and doing really really weird stuff between the ECS threadpool and the slowjob Threadpool. so even if i dont like to have multiple threads i think there is no other workaround than just creating a second threapool for background tasks 2022-08-19 09:50:00 +02:00
Marcel Märtens
8ca458188d also those dispatcher tricks wont help the test, it still sporadically fails 2022-08-19 09:30:56 +02:00
Marcel Märtens
25d9e5b27e workaround for https://github.com/rayon-rs/rayon/issues/969
Unfortuatly rayon has a bug that if you Threadpool.spawn from inside a parallel iterator from inside a Threadpool.install, that the parallel iterator will BLOCK till the Threadpool.spawn finished, which causes many many lag spikes.
I assume this might be the case for the pictures in the gantt chart where a system took unusual long or had a long pause that was unexplained.
I also raise the number of threads by 1, as this rayon thread will prob be useless in all cases and have no real work to do.

EDIT: it turns out the tests are sporadicly failing and this soluction doesnt work
2022-08-19 09:30:00 +02:00
Marcel Märtens
c968e5c748 Initial reproduction of the slowjob freezen with par_iter and slowjob,
See that we spawn 2 jobs in the first loop, the loop seems to NOT complete until those jobs are executed

Next step is to do everything with plain rayon coding
2022-08-18 12:38:17 +02:00
Tormod Gjeitnes Hellen
e306b3bfe3
Have the ambushers say something.
Very unsure about the way I did this...
2022-08-17 23:50:09 +02:00
Marcel
c6bcdd7a2c Merge branch 'juliancoffee/i18n-tooling-fluent' into 'master'
Implement i18n-tooling

See merge request veloren/veloren!3536
2022-08-17 20:39:00 +00:00
juliancoffee
847ee1c1b1 Implement i18n-tooling
* Working csv export
* Working i18n-check
2022-08-17 22:46:48 +03:00
DaforLynx
daadf3abdb Gnarling Fort music; more specific sites; fix music spacing; new sfx 2022-08-14 01:57:58 +00:00
Samuel Keiffer
a1b5f53d15 Merge branch 'craft-all' into 'master'
Craft all

See merge request veloren/veloren!3525
2022-08-12 00:47:48 +00:00
Julio Cezar Silva
9315482fc4 Craft all 2022-08-12 00:47:48 +00:00
Joshua Barretto
602de267b1 Perform validation on all kinds of chat message 2022-08-11 11:11:33 +01:00
Joshua Barretto
52bd7b2485 Added automod 2022-08-11 11:09:52 +01:00
IsseW
87821d5c1d force update counter 2022-08-09 19:22:09 +02:00
Isse
0471e78f41 spectate mode :D 2022-08-09 18:43:13 +02:00
Imbris
d5b59c2bb7 Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage 2022-08-08 00:38:20 -04:00
juliancoffee
f2df1adf27 Improve documentation 2022-08-07 16:21:58 +03:00
juliancoffee
8ba50e62d5 New i18n implementation based on Fluent 2022-08-06 21:45:23 +03:00
Samuel Keiffer
abf0a27323 Merge branch 'sam/remove-cr-ui' into 'master'
Removed weapon CR from UI.

See merge request veloren/veloren!3497
2022-07-30 16:22:29 +00:00
Sam
29dd9eac9b Remvoed CR from UI. Changed all stats in tools and armor to be same size. Cleaned up item stats UI code. 2022-07-28 19:19:20 -04:00
Sam
28a4ce9be1 Various tweaks 2022-07-26 19:44:49 -04:00
Marcel Märtens
ffe7b2158d put light_emitters in par_loop to improve the runtime of the campfire lit out loop 2022-07-18 20:56:28 +02:00
Forest Anderson
67534488b3 Merge branch 'tygyh/CleanUp' into 'master'
Tygyh/clean up

See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
tygyh
120ee6b6c0 Fix typos 2022-07-15 18:59:37 +02:00
tygyh
25e20b5fa0 Remove unecesssary lifetimes 2022-07-15 16:20:15 +02:00
tygyh
cbe4d9d807 Remove unused imports 2022-07-15 16:00:27 +02:00
tygyh
fefe745508 Reorder impl member order to match trait member order 2022-07-15 15:54:32 +02:00
tygyh
5e5698249b Remove unnecessarily qualified paths 2022-07-15 14:49:46 +02:00
Christof Petig
2dce472d1f Merge branch 'christof/modular-weapon-prices' into 'master'
Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list

See merge request veloren/veloren!3469
2022-07-14 18:24:21 +00:00
Isse
1e3b5383cf Merge branch 'zesterer/better-rain' into 'master'
Better rain

See merge request veloren/veloren!3464
2022-07-13 23:25:33 +00:00
Christof Petig
bb952fe755 rustfmt the last cleanup 2022-07-13 23:38:11 +02:00
Christof Petig
edfe6d887e final polish 2022-07-13 23:32:20 +02:00
Christof Petig
eab062450a clippy helped to get rid of one level of indirection 2022-07-13 23:27:17 +02:00
Christof Petig
d2aa9028ec clippy is right about this flat_map 2022-07-13 23:17:22 +02:00
Christof Petig
197f84a360 returning a vec creates much more readable code 2022-07-13 23:03:58 +02:00
Christof Petig
3bdeb77268 Full support for modular weapon in loot table read 2022-07-13 22:56:52 +02:00
Christof Petig
a0749ac9bc test passes, not happy with implementation yet 2022-07-13 20:15:28 +02:00
Christof Petig
5bbb73bc17 changelog + remove dead code, but the test still fails 2022-07-13 20:15:28 +02:00
Christof Petig
5ee72f8a5e fix test; add tusk, crest, pincer 2022-07-13 20:15:28 +02:00
Christof Petig
8c5901516e clean up 2022-07-13 20:15:28 +02:00
Christof Petig
7a1218cf2f make a recipe of all modular weapons 2022-07-13 20:15:28 +02:00
Christof Petig
3a7835c6d0 replace one Owned reference by the normal Reference type 2022-07-13 20:15:28 +02:00
Avi Weinstock
cea2550dde Add Item::new_from_item_definition_id. 2022-07-13 20:15:28 +02:00
Christof Petig
7e5ebada2d still incomplete but looks surprisingly usable 2022-07-13 20:15:28 +02:00
Christof Petig
33a01a0dab fix compilation of example 2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403 use ItemDefintionId across trade_pricing 2022-07-13 20:15:27 +02:00
Avi Weinstock
27d2cdeb79 WIP modular weapon pricing. 2022-07-13 20:15:27 +02:00
Socksonme
3f0f1c423c Small fixes 2022-07-12 21:01:47 +00:00
Joshua Barretto
836fe2b1c6 Proper lightning 2022-07-09 01:59:18 +01:00
Joshua Barretto
4531a4e3f9 Added lightning 2022-07-08 23:26:33 +01:00
Joshua Barretto
28bc9db198 Better cloud cover 2022-07-08 18:09:13 +01:00
Joshua Barretto
853d622e19 Better fall rate 2022-07-08 16:41:31 +01:00
Joshua Barretto
23aea72466 Fixed fall rate 2022-07-08 16:09:36 +01:00
Isse
c0f06dcb8a Merge branch 'socksonme/fix_crushing_damage_crit' into 'master'
Group up extra damage from crushing attacks whenever they're crits

See merge request veloren/veloren!3461
2022-07-06 21:38:41 +00:00
Socksonme
e3b1d02fce Group up extra damage from crushing attacks whenever they're crits 2022-07-06 22:59:58 +03:00
Marcel Märtens
e4909650e1 update hashbrown, specs, and tracy 2022-07-06 15:41:59 +02:00
IsseW
6d8cbe6f0f remove relative rain direction and increase FALL_RATE 2022-07-04 18:18:43 +02:00
IsseW
a7c724a46d Limit figures drawn for rain occlusion 2022-07-04 18:18:35 +02:00
IsseW
27ec6d7469 add weather_zone command 2022-07-04 18:18:33 +02:00
IsseW
9f26afb4a5 refactor rain_dir to rain_vel 2022-07-04 18:11:45 +02:00
IsseW
121cf3becc Comment fixes 2022-07-04 18:11:44 +02:00
Treeco
0d21361e05 Add player-relative rain direction 2022-07-04 18:11:42 +02:00
IsseW
fd12c8abdb Remove dead shader code, clean up weather.rs 2022-07-04 18:10:06 +02:00
IsseW
6215ccd522 Remove dead code 2022-07-04 18:07:24 +02:00
IsseW
3eabe24f12 base occlusion texture size of off voxels 2022-07-04 18:07:19 +02:00
IsseW
08b0989789 add slider for rain map resolution 2022-07-04 18:07:18 +02:00
IsseW
54f958acc7 more correct occlusion 2022-07-04 18:07:16 +02:00
DaforLynx
aafd13508d Completely redoing ambient sound again. 2022-07-04 18:07:08 +02:00
DaforLynx
16ca1410be Remove extraneous sfx code 2022-07-04 18:07:08 +02:00
DaforLynx
ca815f25a1 merging some UI sfx from a now-dead branch
Merge part 2

merge part 3

Merge part 4

merge part 5
2022-07-04 18:07:07 +02:00
IsseW
4fa2644507 Interpolate weather in voxygen 2022-07-04 18:07:04 +02:00
IsseW
78c1de19cf More accurate weather sim 2022-07-04 18:04:39 +02:00
IsseW
6585ef1513 weather dependant music 2022-07-04 18:11:43 +02:00
IsseW
b7c0196129 Server weather sim 2022-07-04 18:11:41 +02:00
Socksonme
6a355c58f2 Remove instance from PoiseChange 2022-06-29 18:36:05 +03:00
Socksonme
2c5fd06d0b Address review
- Change hp_pulse to not be framerate dependent
- Change some of the HpFloater checks to be inside the find() function
- Remove unnecessary join
- Add back option for showing incoming damage + add option for
  experience accumulation
- Change `ExpFloater`s to not store the owner, as they are only shown
  for the player (will have to see if the implementation is correct so
  that it may be applied to the other floaters)
- Rename `Outcome::Damage` to `Outcome::HealthChange` and `DamageInfo`
  to `HealthChangeInfo`
- Update some outdated comments/documentation
2022-06-29 17:31:58 +03:00
socksonme
eabbfe6a51 Remove damage batch option + crit_mult 2022-06-29 17:31:54 +03:00
socksonme
0e84794217 change font size formula to not use crit_mult + use ints for change by check 2022-06-29 17:31:43 +03:00
socksonme
3d2dcbf894 Revert some changes 2022-06-29 17:31:43 +03:00
socksonme
559d5ca804 Some changes to DamageSources + various code qual changes 2022-06-29 17:31:43 +03:00
socksonme
5360a7c93e Tons of code quality changes, added damage rounding option 2022-06-29 17:31:37 +03:00
socksonme
64f0f05608 Fixed bug with healing above 5.0 and preparing for options 2022-06-29 17:31:10 +03:00
socksonme
db16e6147c Instance inside projectile constructor is now a variable 2022-06-29 17:31:09 +03:00
socksonme
202d558246 Instance number generated inside projectile constructor, remove crit field 2022-06-29 17:31:07 +03:00
socksonme
6c75ad6ef8 Code quality changes and comments 2022-06-29 17:30:54 +03:00
socksonme
c0e78d869e Instance numbers are now based on the AttackDamage struct 2022-06-29 17:30:53 +03:00
socksonme
ac5bf53c42 Instance numbers for HpChanges 2022-06-29 17:30:50 +03:00
socksonme
f8924d6c1a tweaks to damage floaters
Added some comments where stuff needs to be discussed
2022-06-29 17:30:32 +03:00
socksonme
7a1e19d42c Crits now only glob with eachother, now show up like healing
Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later
2022-06-29 17:30:29 +03:00
socksonme
ce95680df9 Addressed comments, health and damage floaters are now separated
Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed
2022-06-29 17:29:59 +03:00
socksonme
94f193fbe0 Damage outcomes are now emitted with health change events
Being healed and damaged at the same time still leads to issues - needs to be sorted out
2022-06-29 17:29:19 +03:00
socksonme
634a3095d6 Handling crits (very bad color choice+naming) 2022-06-29 17:24:05 +03:00
socksonme
93d3ce18b4 Remove dbgs and temporary? 0.0 damage fix 2022-06-29 17:24:05 +03:00
socksonme
aee7888a92 HpFloaters are now created by Outcomes, touched up Damage Outcome 2022-06-29 17:24:05 +03:00
socksonme
bf6c6fb33d Changed Damage Outcome to store more data 2022-06-29 17:24:05 +03:00
Sam
4a5ef6dce3 Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage.
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
2022-06-17 21:13:45 -04:00
Imbris
950723dd0d Add metrics for counting server events 2022-06-15 00:40:58 -04:00
Samantha W
57ab1c5767 Add a client-side mutelist 2022-06-14 20:35:01 +00:00
IsseW
e05da7f6fa fix depot bug 2022-06-09 09:53:06 +02:00
Christof Petig
a55cbbbf11 move the character_state test to the systems crate (where the infrastructure is complete) 2022-06-08 07:47:20 +02:00
Christof Petig
b702a27b28 different incomplete unit test attempts [ci skip] 2022-06-08 07:46:00 +02:00
Christof Petig
f8dd030643 remove dead code, test skeleton 2022-06-08 07:46:00 +02:00
Christof Petig
9c07f204a4 introduce a fast path for the common case of already horizontal ori and small rotation changes 2022-06-08 07:46:00 +02:00
Marcel Märtens
17661d9655 Revert "massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator"
This reverts commit 819dae754e.

I wanted to have it in the commit history though
2022-06-07 22:57:40 +02:00
Marcel Märtens
819dae754e massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator
do physics always after character_behavior as this one is saying how the input should be handled
2022-06-07 22:57:17 +02:00
Marcel Märtens
997b330f19 add physics tests that verify the status quo 2022-06-07 22:53:34 +02:00
terrarier2111
45efdb6602 Implement group owned loot 2022-06-04 17:16:12 +00:00
Christof Petig
59d876a654 pass humidity to meta, move smoke cycle to separate file 2022-06-01 22:13:34 +02:00
Maxwell
14d5b2e579 added all other types of chest sprites to check for non-explodable objects 2022-05-30 22:41:57 -05:00
Maxwell
a8892bab53 updated explode_power function to make chests non-explodable 2022-05-30 22:40:59 -05:00
Sam
5e57eabd11 Code changes and msm 2022-05-30 20:25:31 -04:00
N A
c09f070241 Change animal species to have only one inventory slot 2022-05-29 23:53:00 +00:00
Christof Petig
b8c3d71fbe economy trace defaults to info 2022-05-29 19:08:39 +02:00
Benoît du Garreau
8488c7b25e Upgrade assets_manager to 0.8.0 and image to 0.24
This removes a significant number of duplicated dependencies
2022-05-28 23:18:31 +02:00
Ben Wallis
34f580dfaa Introduced loot ownership rules to combat loot stealing by players
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
2022-05-28 12:06:49 +00:00
Christof Petig
2bf8e1865f Skiing and ice skating 2022-05-27 17:19:52 +00:00
Imbris
ca1a27bd11 Merge branch 'imbris/update-tracy' into 'master'
Update tracy

See merge request veloren/veloren!3400
2022-05-27 02:50:24 +00:00
Joshua Barretto
3b6e6be947 Merge branch 'zesterer/fix-climbing' into 'master'
Fixed climbing

See merge request veloren/veloren!3401
2022-05-26 09:34:10 +00:00
Joshua Barretto
4eb781cdf7 Fixed climbing 2022-05-26 10:08:41 +01:00
Imbris
a366fc4512 Update tracy 2022-05-26 00:04:03 -04:00
N A
d84a26dfd8 Special case taming and mounting. 2022-05-24 02:09:45 +00:00
Corvella
42af9b8e15 Hitbox improvements 2022-05-23 09:18:10 +00:00
Joshua Barretto
d18483756b Fixed frozen character when wall-run into water horizontally 2022-05-22 19:37:52 +01:00
Sam
bbe22d6807 Fixed bins (no assets) 2022-05-18 16:44:09 -04:00
Sam
534c7dc8b9 Simplified item key (no assets) 2022-05-18 16:28:06 -04:00
Sam
72f38068e0 Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (no assets). 2022-05-16 15:11:44 -04:00
Sam
bcf36d08b0 Add removed items to migration. 2022-05-16 15:11:43 -04:00
Sam
54a6c31c63 Slight optimization to persistence 2022-05-16 15:11:42 -04:00
Sam
85c2a85817 Addressed review comments 2022-05-16 15:11:42 -04:00
Sam
00276acbdb More feedback addressed (no assets). 2022-05-16 15:11:41 -04:00
Sam
5d0ba6e2b8 Addressed round 3 of feedback (no assets). 2022-05-16 15:11:41 -04:00
Sam
c0dd748bc7 Addressed second round of balance feedback (no assets). 2022-05-16 15:11:40 -04:00
Sam
95c3fdffa1 Addressed playtest feedback (no assets). 2022-05-16 15:11:39 -04:00
Sam
f47cbeb022 Addressed review comments 2022-05-16 15:11:38 -04:00
Sam
de8f98446e Fixed errors in csv import, csv export, and recipe graphviz bins 2022-05-16 15:11:37 -04:00
Sam
528b62c59a Rebase commit 2022-05-16 15:11:36 -04:00
Sam
64d07d02c4 Changed item definition id to better handle modular items. 2022-05-16 15:11:34 -04:00
Sam
37442b638c Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets). 2022-05-16 15:11:33 -04:00
Sam
afd2c8730f Addressed most review comments (no assets). 2022-05-16 15:11:32 -04:00
Sam
816c265662 Rebase stuffs 2022-05-16 15:11:26 -04:00
Sam
fceb48c3ac Removed vec allocation for component recipe iterators 2022-05-16 15:11:26 -04:00
Sam
a5a517916e Initial UI including ingredients in crafting modular components 2022-05-16 15:11:25 -04:00
Sam
085b18c07a Formatting tweaks to tooltips 2022-05-16 15:11:25 -04:00
Bryant Deters
075fee5190 modular component tooltips 2022-05-16 15:11:25 -04:00
Sam
e69aa8c4ee Fixed items with components having incorrect hashes 2022-05-16 15:11:24 -04:00
Sam
6fa7852a8c Fixed random generation of modular weapons. 2022-05-16 15:11:23 -04:00