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
14,193 Commits 151 Branches 18 Tags 2.1 GiB
c6e9d3a202
Commit Graph

3773 Commits

Author SHA1 Message Date
Sam
0ecf4fbe87 Dual wielding weapons of the same kind added as a context 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
6fe102b86d Fixed cyclops loot table 2023-05-04 19:57:18 +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
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
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
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
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
0966753699 Added repair recipes 2023-04-06 10:54:48 -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
49e734fa0b Merge branch 'christof/multi_model_vox' into 'master' 
Support multiple models in one vox file, e.g. for figures

See merge request veloren/veloren!3830
 2023-04-06 07:09:20 +00:00
Youssef Fahmy
7c85460f18 Teeny changes to crippling stance abilities 2023-04-05 23:17:57 +00: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
Joshua Barretto
b3cd1c1e56 Merge branch 'inventory-list' into 'master' 
Add a list mode to inventories to make it easier to see item names at merchants.

See merge request veloren/veloren!3755
 2023-04-04 16:54:15 +00:00
Marcel
914f93e18a Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3847
 2023-04-03 21:40:32 +00:00
Avi Weinstock
8facf7b58d Add a list mode to inventories to make it easier to see item names at merchants. 2023-04-03 14:43:14 -04:00
Joshua Barretto
ab5561df61 Removed redundant things 2023-04-02 01:09:12 +01:00
Monty Marz
ca18da8061 UI tweaks 2023-04-01 21:54:48 +02:00
Joshua Barretto
9645172135 Slightly smoother FxUpscale 2023-04-01 18:06:20 +01:00
Joshua Barretto
19db823092 Proper next/prev site buttons 2023-04-01 12:34:58 +01:00
tygyh
dedf93c6ad Fix issue #1758 for Swedish 2023-03-31 21:02:41 +02:00
tygyh
4067990847 Update swedish translations 2023-03-31 17:36:17 +02:00
Joshua Barretto
c28e61383d Added target to starting site map 2023-03-31 16:25:24 +01:00
Joshua Barretto
acec45b756 Initial implementation of starting site choice 2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8 Merge branch 'more_spot_things' into 'master' 
grave models, spot fixes, sword overlay

See merge request veloren/veloren!3842
 2023-03-31 02:57:39 +00:00
Isse
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2 grave models, spot fixes, sword overlay 2023-03-29 13:10:49 +02:00
Samuel Keiffer
a737a1862c Merge branch 'sam/sword-balance-0' into 'master' 
Sword Tweaks

See merge request veloren/veloren!3838
 2023-03-29 01:26:33 +00:00
Sam
c9af470cc7 Final tweaks 2023-03-28 20:55:21 -04:00
Marcel
864666a73b Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3835
 2023-03-28 23:34:22 +00:00
kinoshi
f0fa766410 Update russian translations 2023-03-28 23:26:11 +00:00
Sam
4309767898 Tweak 2023-03-27 21:51:45 -04:00
Sam
cdaf9e5c0e Ability changes 2023-03-26 21:41:22 -04:00
Sam
ef7b400cca Number tweaking 2023-03-26 19:50:42 -04:00
Sam
124c8cfb65 Weapon stat tweaks 2023-03-25 13:05:26 -04:00
Sam
f2dfaf0276 Fixed dullahan AI. Some number tweaks. 2023-03-23 21:56:16 -04:00
Sam
ac115055ac Final icons 2023-03-21 20:18:34 -04:00
Sam
1301fff800 Agility stance ability icons. 2023-03-21 20:18:33 -04:00
Sam
8b0a59c0dd Heavy stance ability icons. 2023-03-21 20:18:33 -04:00
Monty Marz
3e37586ba5 icons 2023-03-21 20:18:32 -04:00
Sam
4d0b192fbd Icons for crippling stance abilities. 2023-03-21 20:18:32 -04:00
Sam
e962690fb8 Tweaks to various stats and earth splitter animation. 2023-03-21 20:18:31 -04:00
Monty Marz
3a3dc0d0f9 3 more icons 2023-03-21 20:18:31 -04:00
Sam
25c42e927a Rebase 2023-03-21 20:18:28 -04:00
Sam
cc84fb3df3 Fix manifest 2023-03-21 20:16:58 -04:00
Sam
8574066176 Made descriptions more informative 2023-03-21 20:16:58 -04:00
Sam
610d47f787 Effect power now affects more than just poise 2023-03-21 20:16:55 -04:00
Sam
1a58b7a8d4 Balance tweaks 2023-03-21 20:13:48 -04:00
Sam
e37e4016d6 Balance tweaks 2023-03-21 20:10:44 -04:00
Monty Marz
cbbbab6bff moar icons 
quickdraw icon
 2023-03-21 20:10:43 -04:00
Sam
868a42ba39 Addressed UX feedback 2023-03-21 20:10:40 -04:00
Sam
f866bc053c Added note in ability descriptions about which ones are modified by stances. 2023-03-21 20:08:20 -04:00
Sam
c9db227e43 Various things can cause one to naturally leave a stance. Also mildly buffed cultists. 2023-03-21 20:07:34 -04:00
Sam
34168d9c76 Advanced AI for every stance. 2023-03-21 20:03:21 -04:00
Monty Marz
9ea70d71e5 more icons 2023-03-21 20:03:21 -04:00
Sam
e31668b188 Fixed dynlib features to not have UB when allocating. 2023-03-21 20:03:20 -04:00
Monty Marz
ca9fdfa291 more icons 2023-03-21 20:03:18 -04:00
Sam
7365fcb530 Rolls cancel recover at the cost of additional energy, sitting ends active stances. 2023-03-21 20:03:15 -04:00
Monty Marz
6b5ae2b6fe Update sword_bg.png 
positioning, wording, more icons

positioning, first icons
 2023-03-21 19:59:06 -04:00
Sam
b3edc5f7c6 Fix crash 2023-03-21 19:59:06 -04:00
Sam
39b30b3458 Decontextualized some sword abilities, added UI for sword skill tree. 2023-03-21 19:59:05 -04:00
Sam
f43d25d3fe Ability icons 2023-03-21 19:59:04 -04:00
Sam
e552cf579e Added english localization for sword abilities. 2023-03-21 19:59:04 -04:00
Sam
27463758e5 Finisher abilities 2023-03-21 19:59:03 -04:00
Sam
86dfa34ec9 Cleaving stance required abilities 2023-03-21 19:59:00 -04:00
Sam
fed96b2e15 Crippling stance required abilities 2023-03-21 19:58:13 -04:00
Sam
c3026d388a Defensive stance required abilities 2023-03-21 19:58:11 -04:00
Sam
69665b5418 Agility stance required abilities 2023-03-21 19:56:35 -04:00
Sam
a3d655970e Heavy stance required abilities 2023-03-21 19:56:32 -04:00
Sam
e73236819a Cross cut 2023-03-21 19:39:42 -04:00
Sam
d64c155115 Cascade 2023-03-21 19:39:41 -04:00
Sam
f8c246e5fc Skewer 2023-03-21 19:39:41 -04:00
Sam
cdaff6bec1 Fell strike 2023-03-21 19:39:40 -04:00
Sam
e0a7449a99 Crescent slash 2023-03-21 19:39:40 -04:00
Sam
fce9211d49 Secondaries for all stances 2023-03-21 19:39:39 -04:00
Sam
596fe715b8 Cleaving stance skill abilities. 2023-03-21 19:39:39 -04:00
Sam
070c6d94a5 Crippling stance skill abilities. 2023-03-21 19:39:38 -04:00
Sam
d544010c05 Defensive stance skill abilities. 2023-03-21 19:39:38 -04:00
Sam
c23139d501 Agile stance skill abilities. 2023-03-21 19:39:37 -04:00
Sam
ed0de15a5a Heavy stance skill abilities. 2023-03-21 19:39:35 -04:00
Sam
57806d7be9 Sword M1 abilities 2023-03-21 19:39:22 -04:00
Sam
61f0b424b9 Old sword mostly torn out, new sword framework in place 2023-03-21 19:39:22 -04:00
Sam
7ec9a7677f Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability. 2023-03-21 19:38:18 -04:00
Sam
b376228d45 Primary and secondary abilities can now be contextual. BasicStance character state added. 2023-03-21 19:38:15 -04:00
Sam
9875008efa Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement). 2023-03-21 19:29:34 -04:00
tygyh
cb3c6f72c5 Update swedish translations 2023-03-20 22:34:08 +01:00
flo666
897d1e5fe5 fix_ngoubou_jaw 2023-03-20 22:07:23 +01:00
Imbris
61cb0ad39b Merge branch 'imbris/small-tweaks' into 'master' 
Various small tweaks / fixes

Closes #1475

See merge request veloren/veloren!3817
 2023-03-18 00:52:20 +00:00
Imbris
94dd8c2b70 Address review on 3817 2023-03-17 20:17:46 -04:00
Christof Petig
b555d619fb prefer imbris syntax proposal, documentation and changelog 2023-03-17 22:35:47 +01:00
Christof Petig
28da420c82 enable spot addition via ron file 2023-03-17 22:35:47 +01:00
Pexxxzz
04398dba49 Add "You" selector for hud-loot-pickup-msg 2023-03-14 21:22:07 -04:00
Isse
29d9c9dcae move key and lockpick models to voxel folder 2023-03-13 00:54:29 +01:00
Ben Wallis
45c8934b79 Merge branch 'xvar/queue-char-deletes' into 'master' 
Changed character deletion to go via batch update

See merge request veloren/veloren!3562
 2023-03-12 23:21:54 +00:00
Ben Wallis
6eedc02286 Changed character deletion to go via batch update 2023-03-12 23:21:53 +00:00
Samuel Keiffer
8febcf6b3d Merge branch 'sam/buffs' into 'master' 
Auras and buffs no longer need to tick every tick

See merge request veloren/veloren!3814
 2023-03-12 22:06:48 +00:00
Isse
fd34e48d15 Merge branch 'floppy_bird_medium_scale' into 'master' 
bird_medium_scale

See merge request veloren/veloren!3820
 2023-03-12 18:08:21 +00:00
flo
704af5ef7b bird_medium_scale 2023-03-12 18:08:21 +00:00
Marcel
607220b3d7 Merge branch 'DuckLuck/translations_updates_pt-BR' into 'master' 
Update translation for pt_BR

See merge request veloren/veloren!3821
 2023-03-12 07:52:22 +00:00
Imbris
6b8e22d6cc Improvements and fixes for interacting/collecting 
* Inert entities like arrows no longer block interactions like picking
  up items! Logic looking for the closest entity will skip them.
* When pickaxe is not equipped and wielded we now show "Needs Pickaxe"
  as the hint text for mineable blocks.
* Mineable blocks that aren't pointed at now show the mining text hint
  instead of the text hint used for regular collectible blocks.
* Fixed recent bug where all interactables were showing the open text hint.
* Split `BlockInteraction` out of the `Interaction` enum in voxygen
  since we were using this enum for two different things.
 2023-03-11 21:17:27 -05:00
Pexxxzz
1d9eb08a95 Update translation 
Add new translations;
Remove 1 unused translation;
Create quest.ftl and they translations.
 2023-03-11 20:08:32 -04:00
Marcel
2ad53aaa36 Merge branch 'vasco/zoom' into 'master' 
Italian translations

See merge request veloren/veloren!3813
 2023-03-11 23:57:45 +00:00
Marcel
bac621e6ca Merge branch 'Rovetown/update-de_DE' into 'master' 
Updated the German translation for the ability.ftl

See merge request veloren/veloren!3819
 2023-03-11 23:41:54 +00:00
Marcel
7c8fc7191b Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3811
 2023-03-11 22:41:39 +00:00
Jonathan Berglin
cdcc605464 Update swedish translations 2023-03-11 22:41:38 +00:00
Sam
9efac9957d Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component. 2023-03-11 16:45:11 -05:00
Sam
89aa934c3c Initial work 2023-03-11 16:45:10 -05:00
Rovetown
26b88537da Updated the German translation for the ability.ftl 2023-03-11 22:41:44 +01:00
Monty Marz
277a402781 Initial quest window work, spot fixes 2023-03-10 22:16:26 +00:00
Francesco Vasco
30e327d357 Italian translations 2023-03-08 19:00:11 +01:00
Cat Stevens
83e4cdfe76 Allow locking camera zoom 
Allow the camera's zoom to be locked by a keybind
	or a Gameplay setting. The zoom lock
	behavior can be changed between Toggle
	and Auto, where Auto only locks the camera
	zoom while specific movement/combat inputs
	are being pressed. (closes !1528)

A temporary fading notification is shown at the
	top of the screen, informing the player of
	the setting change (when the keybind is
	used) or that the zoom is locked (when
	the player might have forgotten the zoom
	is locked, and is trying to zoom).

i18n strings are added for English and German,
	but no other languages.

To implement the simplistic fading text, the
	behavior was extracted into an impl
	called `ChangeNotification`, where
	reasons are quantified by `NotificationReason`.
 2023-03-05 11:30:27 -05:00
Monty Marz
9a025cfcc8 More spot features 2023-03-03 23:21:37 +00:00
Joshua Barretto
de1c961141 Fixed apple sprite offset 2023-03-01 12:09:41 +00:00
Samuel Keiffer
01da8b6a82 Merge branch 'tursus_werewolf_anim&spawn_loot_tweaks' into 'master' 
spawn and loot tweaks, tursus and werewolf anims

See merge request veloren/veloren!3790
 2023-02-22 01:32:05 +00:00
flo
98e93d1a1c spawn and loot tweaks, tursus and werewolf anims 2023-02-22 01:32:05 +00:00
Marcel
63c8baffe1 Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Remove unused 'hud-chat-mod' entry

See merge request veloren/veloren!3793
 2023-02-17 10:04:09 +00:00
flo
bf81ffc029 frost_gigas 2023-02-15 00:10:37 +00:00
flo
0531b40fae bird_medium_2 2023-02-14 23:17:20 +00:00
tygyh
85d01a990c Remove unused 'hud-chat-mod' entry 2023-02-08 20:58:43 +01:00
James Melkonian
87f5a3345d Fix sword sfx 2023-02-07 16:57:22 +00:00
Avi Weinstock
707e189034 Nerf non-potion drinks. 2023-02-01 20:39:29 -05:00
Marcel
2153196294 Merge branch 'misc_creatures' into 'master' 
misc_creatures

See merge request veloren/veloren!3783
 2023-02-01 10:41:01 +00:00
Marcel
76b6da55f6 Merge branch 'MadirexRus/russian-translation-update' into 'master' 
Madirex rus/russian translation update

See merge request veloren/veloren!3782
 2023-02-01 10:40:58 +00:00
MadirexRus
f0f2aac93b Madirex rus/russian translation update 2023-02-01 10:40:58 +00:00
Marcel
4beb732630 Merge branch 'update-pt_BR' into 'master' 
Update pt br - 2021-01-30

See merge request veloren/veloren!3785
 2023-01-31 22:32:41 +00:00
flo666
e63ab8338e don't spawn tursus 2023-01-31 20:47:56 +01:00
flo666
d219cdd97c spawns & hitboxes 2023-01-31 20:34:41 +01:00
flo666
9c09000256 - change bristlemane to bristleback 
- axebeak tweaks
 2023-01-31 20:34:41 +01:00
flo666
e109f5c377 axebeak, tursus 2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3 bristlemane 2023-01-31 20:34:40 +01:00
flo666
271b80b832 seal 2023-01-31 20:34:40 +01:00
Nicolas Wildner
34c69a2c30 Updating some translations, reordering others to match order with EN language - part 2 2023-01-30 02:13:31 +00:00
Nicolas Wildner
0e212f61bf Updating some translations, reordering others to match order with EN language 2023-01-30 00:59:46 +00:00
Christof Petig
f306b6ee69 make lamps, embers and campfires use glowing indices for the brightest fiery colors 2023-01-29 18:53:18 +01:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master' 
wyverns

See merge request veloren/veloren!3720
 2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Isse
d949348661 Moderator badge 2023-01-28 03:10:24 +01:00
Marcel
436453556b Merge branch 'Teffmasterjeff/update-ko_KR' into 'master' 
Update the Korean translation

See merge request veloren/veloren!3777
 2023-01-26 22:54:02 +00:00
Francesco Vasco
2843852457 Italian translation: buff-*-potionsickness 2023-01-26 12:36:45 +01:00
Marcel
91d0227c1b Merge branch 'jdbp/update_es_ES_translation' into 'master' 
feat(i18n): update the Spanish (Castilian) translation

See merge request veloren/veloren!3773
 2023-01-26 08:10:17 +00:00
tygyh
4159ea5b48 Update swedish translations 2023-01-24 16:56:12 +01:00
walpo
4502b2fd68 feat(i18n): update the Spanish (Castilian) translation 
The Spanish translation (es_ES) has "Unused" and "NotFound" strings that need to be fixed
 2023-01-24 15:21:25 +01:00
Marcel
1904740ffd Merge branch 'niniko/update-fr_FR' into 'master' 
Update the French translation

See merge request veloren/veloren!3764
 2023-01-24 08:49:18 +00:00
Zaixun
c02015c6c3 Update the Korean translation 2023-01-23 00:32:21 -07:00
Joshua Barretto
75e07c04f0 Merge branch 'zesterer/glowing-sprites' into 'master' 
Added support for glowing sprites

See merge request veloren/veloren!3771
 2023-01-19 22:31:30 +00:00
Joshua Barretto
d9552f7ff4 Added support for glowing sprites 2023-01-19 21:59:02 +00:00
Avi Weinstock
aba6f6654e Add a new particle mode for potion sickness. 2023-01-19 15:06:14 -05:00
Avi Weinstock
060b8cc0ec Decrease the duration of potion sickness to 45 seconds. Make agents more averse to incurring further stacks of potion sickness, and give villagers iced tea. 2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73 Implement potion sickness, which causes diminishing returns on healing from potions. 2023-01-19 15:06:12 -05:00
Joshua Barretto
da9cd79973 Merge branch 'zesterer/canary' into 'master' 
Added canary asset

See merge request veloren/veloren!3770
 2023-01-18 23:02:07 +00:00
Joshua Barretto
44f4dcc6f7 Added canary asset 2023-01-18 22:01:00 +00:00
Marcel
3a186caf5e Merge branch 'vasco-stamina-energia' into 'master' 
Italian: stamina -> energia

See merge request veloren/veloren!3750
 2023-01-18 18:53:51 +00:00
Francesco Vasco
ed70bd0800 Italian: "crafting" -> "creazione" 2023-01-17 19:54:32 +01:00
Francesco Vasco
36b68f9f85 Italian: stamina -> energia 2023-01-17 19:53:40 +01:00
Nils Ascheuer
d703909557 #1758: fixed in German and English 2023-01-17 10:01:10 +01:00
NiniKo
dbb4772fd2 Update the French translation 2023-01-17 09:42:35 +11:00
Joshua Barretto
696b575611 Merge branch 'zesterer/graphics-fixes' into 'master' 
Fixed rain drop normals and wind direction for sprites

See merge request veloren/veloren!3762
 2023-01-15 19:52:04 +00:00
Thanos Psaridis
2bf23b26a0 Minor soundtrack improvements. 2023-01-15 19:15:59 +00:00
Joshua Barretto
c12e6426fa Fixed rain drop normals and wind direction for sprites 2023-01-15 19:13:18 +00:00
Joshua Barretto
295e3c4109 Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master' 
autodelete of summoned sprites

See merge request veloren/veloren!3735
 2023-01-15 18:28:38 +00:00
flo
650ef9a5e2 autodelete of summoned sprites 2023-01-15 18:28:38 +00:00
Marcel
20610bae23 Merge branch 'jdbp/update_font_file' into 'master' 
fonts: add missing characters to a font file and include its license

See merge request veloren/veloren!3757
 2023-01-15 16:04:34 +00:00
Isse
5378d1b11d Fix doors 2023-01-15 05:13:02 +00:00
jdbp
509f786a7c font: add license of existing font file 
The font license is stated here:
https://fontstruct.com/fontstructions/show/330387/haxrcorp_4089_cyrillic_altgr
 2023-01-14 01:34:19 +01:00
walpo
6875de439b haxrcorp_4089_cyrillic_altgr_extended.ttf: add missing characters 2023-01-14 01:25:26 +01:00
Joshua Barretto
47edca8740 Merge branch 'zesterer/graphics-fixes' into 'master' 
Fixed internal water reflections and improved underwarper

See merge request veloren/veloren!3754
 2023-01-13 17:30:04 +00:00
Marcel
beb934a677 Merge branch 'floppy_dark_guitar&icy_talharpa' into 'master' 
dark_guitar & icy_talharpa

See merge request veloren/veloren!3753
 2023-01-13 13:37:45 +00:00
flo
0eba37ce6a dark_guitar & icy_talharpa 2023-01-13 13:37:45 +00:00
Joshua Barretto
fc564f5313 Fixed internal water reflections and improved underwarper 2023-01-13 11:37:27 +00:00
Joshua Barretto
b127cff26c Merge branch 'zesterer/gbuffers-ssr' into 'master' 
Use normal and material gbuffer to improve quality of SSR

See merge request veloren/veloren!3734
 2023-01-12 20:26:41 +00:00
Joshua Barretto
49749c86a7 Made emissive figures behave correctly 2023-01-12 18:44:26 +00:00
Monty Marz
e21e4a6dd4 Add 0.14 background image 2023-01-12 17:56:50 +00:00