Commit Graph

3852 Commits

Author SHA1 Message Date
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