Commit Graph

3543 Commits

Author SHA1 Message Date
Isse
ab4076518f Add multiloot 2023-04-23 19:17:39 +00:00
pegasus4903
534454cf05 Fix french errors 2023-04-22 19:17:05 +00:00
Isse
1494d93fc8 fix cloud tearing 2023-04-19 22:46:35 +02:00
Isse
1442dd29f1 fix NaN issue in apply_point_glow_light 2023-04-19 21:14:19 +02:00
Isse
4b831f884e reduce the offset of clouds on the horizon 2023-04-19 21:01:30 +02:00
Christof Petig
025713e2c0 Merge branch 'christof/fix_orichalcum_drop' into 'master'
introduce optional model indices for drop items as well (fixing orichalcum armor drops)

See merge request veloren/veloren!3884
2023-04-17 07:07:40 +00:00
Christof Petig
4c1c84030f introduce optional model indices for drop items as well (fixing orichalcum armor drops) 2023-04-16 22:56:04 +02:00
Julian Tölle
865b50fff2 rtsim: positive sentiment gain for killing enemies
As per the age old saying: "the enemy of my enemy is my friend".

NPCs will start liking the killer of their enemy more.
2023-04-16 18:08:09 +02:00
Samuel Keiffer
f14d312ac3 Merge branch 'sam/durability-fixes' into 'master'
Durability fixes

See merge request veloren/veloren!3873
2023-04-15 18:03:18 +00:00
Corvella
0fe4bea421 Let women's voices be heard! 2023-04-15 07:24:59 +00:00
Sam
5ba2ebf6d5 Added repair recipes for twig armor sets. 2023-04-14 18:32:33 -04:00
Sam
985661b674 Added repair recipes for pickaxes and craftsman hammer 2023-04-13 21:19:09 -04:00
Joshua Barretto
504ea158d2 Merge branch 'zesterer/towns' into 'master'
Improvements to towns and NPCs

See merge request veloren/veloren!3867
2023-04-13 21:03:02 +00:00
Joshua Barretto
8249675a72 Made airship captains invincible 2023-04-13 18:32:04 +01:00
Joshua Barretto
daacadaedb Made NPCs give directions to nearby towns, fixed player death propagation 2023-04-13 14:34:31 +01:00
Joshua Barretto
2a1ea63910 Allow NPCs to migrate away from towns with a high population density 2023-04-13 12:00:59 +01:00
Imbris
b58a8a9ec3 Ensure in-world UI elements are snapped to pixel borders. 2023-04-13 00:10:12 -04:00
Samuel Keiffer
7aa43e9e8a Merge branch 'taoist/better-dullahan' into 'master'
taoist&floppy/cyclops&dullahan

See merge request veloren/veloren!3859
2023-04-12 22:53:38 +00:00
Tao In Way
e32460f9ee taoist&floppy/cyclops&dullahan 2023-04-12 22:53:38 +00:00
Joshua Barretto
cf701fb604 Localised rtsim NPC speech 2023-04-11 17:00:08 +01:00
Joshua Barretto
efbab102a5 Make LoD towns glow 2023-04-09 19:25:58 +01:00
Joshua Barretto
2eaf3c7e92 Spawn dogs and cats in towns 2023-04-09 19:25:57 +01:00
Joshua Barretto
5aaee96cb1 Removed special-casing of merchants 2023-04-09 19:25:56 +01:00
Isse
adb2e1ba85 very simple repopulation 2023-04-09 19:25:55 +01:00
Isse
1a117f1331 rtsim vehicles 2023-04-09 19:25:54 +01:00
Joshua Barretto
077da13a5f Improved herbalist, hunter, farmer, added cultist factions 2023-04-09 19:25:54 +01:00
IsseW
ca02b5e97c cleaner entity creation 2023-04-09 19:25:52 +01:00
flo
1cca6cfa74 fix_salamander tail_front offset 2023-04-09 10:46:57 +00:00
Imbris
54c39c03f7 Merge branch 'imbris/pixel-perfection-v2' into 'master'
Move image scaling into the UI shaders rather than precomputing it on the CPU

Closes #257

See merge request veloren/veloren!3573
2023-04-08 07:06:19 +00:00
Imbris
5881e44e61 Address review on 3573 2023-04-08 02:19:14 -04:00
Imbris
2a9a63a60e Clippy fixes 2023-04-08 00:51:50 -04:00
Imbris
63096b2042 Complete GPU based alpha premultiplication impl and make the CPU version
even faster.

* GPU based version started in previous commit, but this fixes errors
  and bugs and gets it actually compiling and running.
* Add a way to batch together images to use the same render pass for GPU
  premultiplication if they all target the same texture.
* Pending premultiplication uploads are automatically done when calling
  `Drawer::third_pass`.
* `fast-srgb8` dep removed, we no longer convert to `f32`s to do the
  premultiplication. Two `[u16; 256]` tables are combined to compute the
  alpa premultiplied color within the same error bounds used by the
  `fast-srgb8` crate. We also no longer use explicit simd.
* Remove explicit lifetimes from `PlayState::render` since `&self` and
  `Drawer<'_>` don't need to have the same lifetime.
* Fix existing bug where invalidated cache entries were never set to
  valid when reusing them.
* `prepare_graphic` now runs some heuristics to determine whether
  premultiplication should be executed CPU side or GPU side and then
  returns a bool indicating if GPU premultiplication is needed.
2023-04-08 00:28:31 -04:00
Imbris
efd932c71e Progress on GPU premultiplication.
* General progress in setting up code paths to support GPU
  premultiplication.
* Created `PremultiplyUpload` type to represent an initiated image
  upload where the premultiply pass needs to be ran to complete it.
* Converted from compute pass to render pass since current limitations
  make it difficult to write directly to a srgb image from a compute
  shader.
* Replace `CachedDetails::Immutable` with keeping track of the
  parameters used to create the texture (i.e. the border color).
* Create `TextureRequirements`, `TextureParamters`, and `CacheKey` types
  to encode parameters that go into texture creation and image caching
  and to determine when the space in texture memory should be reused
  when replacing a graphic.
* Add custom texture creation logic for the UI textures since those need
  certain usage combinations.
2023-04-08 00:28:31 -04:00
Imbris
1d51aae3b2 Start attempt to premultiply alpha on the GPU. 2023-04-08 00:28:31 -04:00
Imbris
eb6d16b02c Rename draw_graphic -> prepare_graphic since it is no longer always
specifically rendering an image at the provided dimensions. Start
working on alpha premultipication which is necessary for being able to
properly sample colors on the GPU with bilinear filtering. Various
tweaks to comments and misc changes.
2023-04-08 00:28:31 -04:00
Imbris
69a1a661b6 fixes and tweaks (various minor changes related to UI image scaling on
GPU)
2023-04-08 00:28:31 -04:00
Imbris
d62bf8a790 init (scaling UI images during sampling on the GPU instead of on the CPU) 2023-04-08 00:28:28 -04:00
Sam
4ec2798262 Fix velorite sprite offset 2023-04-06 10:57:19 -04:00
Sam
038929d66d New models for ores and repair bench 2023-04-06 10:57:17 -04:00
Monty Marz
29a7520a48 adjusted death message, fixed repair bench text 2023-04-06 10:57:17 -04:00
Sam
a68ef7af30 Tweaks 2023-04-06 10:57:16 -04:00
Sam
f7765a8471 Added some repair recipes for some missed items. 2023-04-06 10:57:15 -04:00
Sam
92165a8fd8 Repair recipes no longer show ingredients as required when they are not damaged enough to need any 2023-04-06 10:57:14 -04:00
Sam
6a8fc3a423 Tweaked repair recipes 2023-04-06 10:57:14 -04:00
UncomfySilence
3dae7b6d4a small tweaks to repair recipe and addition of cultist, and uncraftable weapon repairs 2023-04-06 10:57:12 -04:00
Sam
e4ebd17363 Addressed feedback 2023-04-06 10:57:12 -04:00
Sam
ca879173be Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist. 2023-04-06 10:56:55 -04:00
Sam
658de93c59 Repairing UI 2023-04-06 10:56:53 -04:00
Sam
536d88a2c7 Repair costs scale based on how damaged the item is. 2023-04-06 10:54:50 -04:00
UncomfySilence
85ceae3354 repair recipes for armor pieces 2023-04-06 10:54:50 -04:00