Marcel
32c7994cca
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!4009
2023-07-05 13:01:08 +00:00
Samuel Keiffer
dab040baa4
Merge branch 'trade-thirdconfirm' into 'master'
...
Added additional confirmation when trading for nothing.
See merge request veloren/veloren!3997
2023-07-03 23:45:59 +00:00
Marcel
620c58fecc
Merge branch 'bd/esperanto' into 'master'
...
Esperanto translation
See merge request veloren/veloren!3432
2023-07-03 23:34:36 +00:00
Brandon Dyer
a7ff12f012
Esperanto translation
2023-07-03 23:34:35 +00:00
tygyh
0b2ad222dc
Update swedish translations
2023-07-03 21:10:37 +02:00
walpo
9c0046f790
i18n: add bulgarian (bg) translation
2023-07-02 08:50:17 +00:00
Joshua Barretto
ffabace13d
Fixed bloom sample UV, added Cinematic shader
2023-06-28 12:21:16 +01:00
Monty Marz
5c3ab74bdf
login background
2023-06-27 21:37:19 +02:00
Avi Weinstock
ced6880168
Added additional confirmation when trading for nothing.
2023-06-26 10:39:30 -04:00
Youssef Fahmy
65ea69bef3
Small balance changes
2023-06-19 01:16:42 +00:00
Samuel Keiffer
079e7bfed6
Merge branch 'uniior/cacti' into 'master'
...
New/revamped cacti sprites
See merge request veloren/veloren!3986
2023-06-18 01:22:33 +00:00
unknown
413befadae
Lowercase asset files
2023-06-17 20:35:28 -04:00
unknown
1269cfe00d
Lowercase asset files
2023-06-17 20:20:05 -04:00
Imbris
69dcc12dcd
Merge branch 'gradientsobel' into 'master'
...
Add `GradientSobel` experimental filter that adds object outlines based on the normal map.
See merge request veloren/veloren!3975
2023-06-08 16:59:20 +00:00
Avi Weinstock
d023f9db54
Only bind the materials texture in the postprocess bindgroup if it's needed.
2023-06-07 16:21:28 -04:00
Avi Weinstock
025831d9a2
Add GradientSobel experimental filter that adds object outlines based on the normal map.
2023-06-07 15:39:57 -04:00
unknown
526386e51c
Initial cacti work
2023-06-07 14:46:54 -04:00
walpo
b919312d1b
Make i18n language identifiers comply with IETF BCP 47
2023-06-07 13:12:34 +00:00
Justin Shipsey
d90926e4a3
Merge branch 'master' into 'master'
...
updating fr_FR translations
See merge request veloren/veloren!3966
2023-06-04 09:32:10 +00:00
Isse
a884e0e058
Various rtsim related stuff
2023-06-03 22:14:18 +00:00
flo
16d58c6b4e
plant creatures
2023-06-03 13:59:52 +00:00
Thomas S
7e7017d705
adding fr_FR translations
2023-06-01 20:17:51 +02:00
Pedro H
25c3fe3657
Add all missing pt_br translations
2023-05-31 21:19:23 +00:00
Joshua Barretto
2064ad5d80
Added color dither
2023-05-31 19:10:09 +01:00
Joshua Barretto
2a9e43b847
Draw distinction between bilinear filtering and nearest neighbour
2023-05-31 18:26:53 +01:00
Joshua Barretto
b2051767ff
More experimental shaders
2023-05-31 17:07:22 +01:00
Marcel
b5c4b435ff
Merge branch 'vasco-steam' into 'master'
...
Italian translation
See merge request veloren/veloren!3949
2023-05-26 15:01:05 +00:00
Marcel
5b7005f8f4
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3929
2023-05-26 15:01:01 +00:00
Jonathan Berglin
fc4e1c8a87
Update swedish translations
2023-05-26 15:01:00 +00:00
Francesco Vasco
713533da0b
Italian translation
2023-05-24 22:45:09 +02:00
flo
a55276ea73
seachapel_rework
2023-05-24 18:13:29 +00:00
DaforLynx
1555797675
Merge branch 'thanosfisherman/loudness_adjustments' into 'master'
...
adjusted eq and loudness to align with the majority of tracks
See merge request veloren/veloren!3941
2023-05-21 21:54:30 +00:00
Thanos Psaridis
8dad923c3a
adjusted eq and loudness to align with the majority of tracks
2023-05-21 21:54:29 +00:00
Joshua Barretto
2219797142
Merge branch 'zesterer/shader-block-kinds' into 'master'
...
Added support for block kinds in shaders
See merge request veloren/veloren!3932
2023-05-21 17:19:51 +00:00
Francesco Vasco
c6ab618d2e
Italian translation
2023-05-20 11:49:07 +02:00
Joshua Barretto
00b2bcb7b4
Merge branch 'zesterer/one-way-walls' into 'master'
...
One-way walls
See merge request veloren/veloren!3943
2023-05-19 17:55:13 +00:00
Joshua Barretto
423e6f0348
Adjusted particle offset
2023-05-19 15:05:18 +01:00
Joshua Barretto
2893f400f8
Better particle lighting
2023-05-19 14:58:59 +01:00
Joshua Barretto
4961ca2f6d
Fixed particle effect UB
2023-05-19 14:46:22 +01:00
Joshua Barretto
c73848b932
Fixed minor issues with walls, better particles
2023-05-19 14:25:49 +01:00
Joshua Barretto
c94d6c502a
Added one-way wall sprites
2023-05-19 13:24:45 +01:00
Marcel
d5ca004d2b
Merge branch 'vasco-adlet' into 'master'
...
Italian translation
See merge request veloren/veloren!3934
2023-05-19 09:35:30 +00:00
Tao In Way
f18297ec75
taoist/charms
2023-05-19 03:07:44 +00:00
Joshua Barretto
a634da2d07
Addressed review comments
2023-05-17 22:22:54 +01:00
Francesco Vasco
295e7003af
Italian translation
2023-05-16 17:50:56 +02:00
Joshua Barretto
aeb72bcf22
Added support for block kinds in shaders
2023-05-15 17:31:21 +01:00
flo666
0ba58d8785
map icon fix & set difficulty indicator to 2
2023-05-13 09:32:28 -04:00
flo666
c7831a8ca9
loot_tables yeti&elder ,
...
change drum to wildskin_drum,
add map icons,
yeti attacks buff
2023-05-13 09:32:27 -04:00
flo666
7739aaff78
add more loot
2023-05-13 09:32:24 -04:00
flo666
9a6ab28c3d
adlet elder tweaks
2023-05-13 09:32:24 -04:00
flo666
ed260f832d
add loot, reduce enemies
2023-05-13 09:32:21 -04:00
flo666
c2cf88da3d
- bigger yetipit mob rooms
...
- tweaks
2023-05-13 09:32:20 -04:00
flo666
25ef582f1a
- sprites IceCrystal, GlowIceCrystal for yetipit
...
- rough creature balance
2023-05-13 09:32:16 -04:00
flo666
38a6cc67f9
add models: bone_door, bone_keyhole, bone_key
2023-05-13 09:31:29 -04:00
flo666
6668df9f08
add adlet elder
2023-05-13 09:30:56 -04:00
flo666
86803c43bf
adlet tracker tweaks
2023-05-13 09:30:54 -04:00
flo666
f936c2f00e
rocky yetipit entrance & AdletTrap object
2023-05-13 09:30:54 -04:00
Sam
95347e8a60
Spear magic
2023-05-13 09:30:53 -04:00
Sam
92e28f09fc
Adlet abilities
2023-05-13 09:30:51 -04:00
flo666
715a0b7b20
rebase
2023-05-13 09:30:50 -04:00
flo666
1750c9a0f2
structure work
2023-05-13 09:30:48 -04:00
jshipsey
da3c2369e5
initial setup
2023-05-13 09:30:13 -04:00
Joshua Barretto
4253833aaf
Add photorealistic experimental shader
2023-05-12 14:02:23 +01:00
Joshua Barretto
1924c67033
Adjusted night ambience
2023-05-12 13:47:01 +01:00
Marcel
5ade37e0a5
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Tygyh/update swedish translations
See merge request veloren/veloren!3922
2023-05-10 15:25:12 +00:00
Jonathan Berglin
448b06ca0a
Tygyh/update swedish translations
2023-05-10 15:25:12 +00:00
Isse
2bc63d22ae
Merge branch 'isse/sittable-sprites' into 'master'
...
Sprites on airships, and mountable sprites
See merge request veloren/veloren!3886
2023-05-10 13:55:51 +00:00
Francesco Vasco
9508fd05bb
Italian translation
2023-05-10 08:17:13 +02:00
Isse
f6f332af6a
send full matrix to shader
2023-05-09 19:43:10 +02:00
Isse
c4cffff92f
apply shader changes from zesterer
2023-05-09 19:43:10 +02:00
Isse
b4c3868dd4
different translation key for mounting Helm
2023-05-09 19:43:10 +02:00
Isse
a35a1a34c4
more sprites on airships
2023-05-09 19:43:09 +02:00
Isse
6674cce2cc
intercat with sprites on ships
2023-05-09 19:43:09 +02:00
Isse
1710dcc111
fix shadows
2023-05-09 19:43:09 +02:00
Isse
fcb7011cde
sprites on volumes
2023-05-09 19:43:09 +02:00
Isse
2928eb8d15
sit on sprites
2023-05-09 19:43:08 +02:00
Joshua Barretto
1cc221f653
Merge branch 'zesterer/rtsim-tweaks' into 'master'
...
Started adding wandering rtsim monsters
See merge request veloren/veloren!3908
2023-05-09 14:51:15 +00:00
Marcel
9ac654baa9
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3920
2023-05-09 13:22:43 +00:00
Francesco Vasco
232d4c932e
Italian translation
2023-05-08 19:29:24 +02:00
tygyh
7f17520163
Update swedish translations
2023-05-08 17:58:45 +02:00
Sam
a38f336c9e
Added dual wielding sword contextual abilities.
2023-05-07 20:43:51 -04:00
Vitalya
b3a1d7af6c
Update ukrainian translation
2023-05-05 09:51:34 +00:00
Joshua Barretto
79dd1e2629
Fixed ambient lighting
2023-05-04 19:57:28 +01:00
Joshua Barretto
f000347cac
Make NPCs respond to each other
2023-05-04 11:53:01 +01:00
Joshua Barretto
2ff0118df0
More rtsim monsters
2023-05-04 10:13:02 +01:00
Isse
a89fcd1a38
swedish subtitles
2023-05-03 13:07:36 +02:00
Isse
99463a37f8
subtitles
2023-05-03 13:07:35 +02:00
Isse
1c9b502f69
move flashing lights to accessability settings tab
2023-05-03 13:07:35 +02:00
Isse
b37a2bf1c7
Merge branch 'hannibal/ui-change' into 'master'
...
Change Other Players to Players
See merge request veloren/veloren!3909
2023-05-02 18:35:28 +00:00
BigKhan
811061062a
Change Other Players to Players
2023-05-02 13:45:19 -04:00
Joshua Barretto
0f92f38967
Started adding wandering rtsim monsters
2023-05-01 18:29:32 +01:00
DaforLynx
7bf6df5ec1
Small music update
2023-04-29 05:34:28 +00:00
Marcel
0b9181ef56
Merge branch 'Terraaaagd/update-es_LA' into 'master'
...
Terraaaagd/update Spanish Latino translation
See merge request veloren/veloren!3878
2023-04-27 21:16:11 +00:00
Marcel
88b26e8db8
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3858
2023-04-27 19:38:28 +00:00
Jonathan Berglin
d5a8829cfd
Update swedish translations
2023-04-27 19:38:28 +00:00
Marcel
53746e5a2c
Merge branch 'AMAIOLAMO/update-zh_CN' into 'master'
...
Amaiolamo/update zh_CN translation
See merge request veloren/veloren!3880
2023-04-27 10:24:30 +00:00
Marcel
bd2e211cbd
Merge branch 'walpo/update_es_es_translation' into 'master'
...
Update the Spanish (Castilian) translation
See merge request veloren/veloren!3896
2023-04-25 17:26:27 +00:00
walpo
ba70f72fb7
Update the Spanish (Castilian) translation
2023-04-25 17:26:27 +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
CxRedix
9a47ef63a6
Ability.ftl translation finished
2023-04-18 15:41:57 +08:00
CxRedix
1768be43d6
added the missing Guillotine ability translation
2023-04-18 14:58:02 +08: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
CxRedix
b24efdbcd7
reviewed and finalized some more translations
2023-04-16 16:49:09 +08:00
CxRedix
fe67ef86b0
made some skills & abilities consistent with the previous translator
2023-04-16 16:04:08 +08:00
CxRedix
7d5f15a5c9
finalized & added some translations in abilities.ftl to make them more easier to read
2023-04-16 15:51:55 +08:00
CxRedix
1ad0ec8c70
added some missing translation from 3 files: char_selection.ftl, common.ftl, gameinput.ftl
2023-04-16 14:36:26 +08:00
CxRedix
4d086bbbe6
added most of the new missing translations for buff.ftl
2023-04-16 14:33:29 +08:00
CxRedix
8141100cf6
added all new npc dialogue
2023-04-16 14:24:38 +08:00
CxRedix
c8b99c44c2
added most of the missing hud translations
2023-04-16 13:58:15 +08:00
CxRedix
0b6abe27f6
added abilities.ftl with most of the translation done
2023-04-16 13:57:31 +08:00
Terraaaagd
c1ecd16cba
Terraaaagd/update Spanish Latino translation
2023-04-15 22:08:23 -03:00
Corvella
0fe4bea421
Let women's voices be heard!
2023-04-15 07:24:59 +00: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
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
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
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
011b6c3feb
Changed how durability was persisted so that a more general system can be used for future item properties.
2023-04-06 10:54:49 -04:00
Sam
c3f5bc13f1
Equipment can now be repaired at sprites in town.
2023-04-06 10:54:48 -04:00
Sam
a555e08d0b
Added durability to item tooltips
2023-04-06 10:54:47 -04:00
Christof Petig
8d2b9b9a9c
single file orichalcum armor
2023-04-04 23:46:20 +02:00
Christof Petig
4da41b0dd0
move alchemist set to single file (with reduced hat size)
2023-04-04 23:46:20 +02:00
Christof Petig
e26cbffa0c
correct offsets from animation settings
2023-04-04 23:46:20 +02:00
Christof Petig
fb06bb651b
a single llama file (smaller)
2023-04-04 23:46:20 +02:00
Christof Petig
b1dc85dc0f
llama in one vox file
2023-04-04 23:46:20 +02:00
