Christof Petig
fbe0aee40d
move trading good properties (decay, transportation) from hard coded to ron file
2022-08-30 00:37:38 +02:00
Marcel
f3e13ee49d
Merge branch 'sau/update-es_ES' into 'master'
...
update the Spanish translation
See merge request veloren/veloren!3575
2022-08-29 20:19:39 +00:00
Marcel
60f05f45a7
Merge branch 'juliancoffee/better-i18n-keys' into 'master'
...
Remake price-tips internationalization
See merge request veloren/veloren!3571
2022-08-29 12:18:36 +00:00
Sau
a8ff0e4e5f
update the Spanish translation
2022-08-29 11:48:54 +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
Marcel
1a11205dbf
Merge branch 'tygyh/Swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3561
2022-08-28 16:38:16 +00:00
juliancoffee
76cd36b179
Remake price-tips internationalization
2022-08-26 17:56:32 +03:00
Imbris
e626519ec0
Replace "Present Mode" options with more user friendly terms:
...
'Fifo' -> 'Vsync capped'
'Mailbox' -> 'Vsync uncapped'
'Immediate' -> 'Vsync off'
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
tygyh
355f916a99
Update translations
2022-08-25 20:47:13 +02:00
flo
f9a31094b6
remove common_ron
2022-08-25 09:01:00 +00:00
flo
e882e62c08
seachapel
2022-08-24 21:50:53 +00:00
tygyh
c5b83e0166
Update swedish translations
2022-08-23 21:18:32 +02:00
Matheus
055f40ddc6
changed/typo to generic masculine
2022-08-21 02:43:09 +00:00
Matheus
467e85dca2
typo fix
2022-08-21 02:28:36 +00:00
matheusclmb
3967501a03
Small/Cultural changes recommended by @jcezarms
2022-08-21 03:26:32 +01:00
matheusclmb
02d6090438
changed some words for better context
2022-08-21 01:42:12 +01:00
matheusclmb
fc9dca7e95
Added gameinput missing keys
2022-08-20 20:48:52 +01:00
matheusclmb
b662d9cce1
Added common missing keys
2022-08-20 20:48:36 +01:00
matheusclmb
636dbc8a22
Added char_selection missing keys
2022-08-20 20:48:20 +01:00
matheusclmb
b288214650
Added and formatted npcs missing keys
2022-08-20 20:48:04 +01:00
matheusclmb
00a13fd893
Added settings missing keys
2022-08-20 20:47:37 +01:00
juliancoffee
e15c375cb5
Use fluent attributes for abilities
...
* Better translation logic and ergonomics
* Cut two format!-s
2022-08-19 18:35:44 +03:00
Marcel
7587fb6e96
Merge branch 'tygyh/swedish-translation' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3542
2022-08-19 07:53:01 +00: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
3860b3ece3
Remove template.ftl file
...
They are empty anyway
2022-08-17 22:46:48 +03:00
tygyh
1ce4cb4901
Update swedish translations
2022-08-17 11:33:46 +02:00
Monty Marz
50701620e6
Temporary invincible merchants
2022-08-16 12:16:45 +00:00
AldanTanneo
ba87a405af
Discord Activity
2022-08-15 15:58:37 +00:00
DaforLynx
daadf3abdb
Gnarling Fort music; more specific sites; fix music spacing; new sfx
2022-08-14 01:57:58 +00:00
Julio Cezar Silva
9315482fc4
Craft all
2022-08-12 00:47:48 +00:00
DaforLynx
258feee634
Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing
2022-08-11 02:56:40 +00:00
IsseW
a165bc09bc
character viewpoint
2022-08-09 18:45:45 +02:00
IsseW
bf44ebd12b
spectate speedup key
2022-08-09 18:44:10 +02:00
Isse
0471e78f41
spectate mode :D
2022-08-09 18:43:13 +02:00
loki
a559645679
deleted .zip folder
2022-08-08 19:03:20 +03:00
loki
5d914c4577
changed folder to new format
2022-08-08 19:01:34 +03:00
loki
88b412f4c7
added romanian translation
2022-08-08 18:26:17 +03:00
Samuel Keiffer
8602a04e71
Merge branch 'floppy-DesertCity' into 'master'
...
DesertCity
See merge request veloren/veloren!3495
2022-08-08 09:58:19 +00:00
flo
5dd9991311
DesertCity
2022-08-08 09:58:18 +00:00
Samuel Keiffer
1066553f21
Merge branch 'juliancoffee/fluent-i18n' into 'master'
...
Use Fluent for localisation (l10n) and internationalisation (i18n)
See merge request veloren/veloren!3508
2022-08-07 18:21:31 +00:00
Marcel
4131b3ac20
Merge branch 'DaforLynx/river-hotfix' into 'master'
...
Lower volume of river sfx
See merge request veloren/veloren!3510
2022-08-06 21:29:38 +00:00
DaforLynx
9a8c288580
Lower volume of river sfx
2022-08-06 21:29:38 +00:00
juliancoffee
a994984b09
Migrate i18n files to new format
2022-08-06 21:57:08 +03:00
juliancoffee
48eeabcc93
Fix broken i18n files
2022-08-06 21:45:23 +03:00
Vincent Foulon
8862258f61
Deny any interaction received during hostile_tree
2022-08-06 18:31:42 +00:00
DaforLynx
bf4a582cf7
WIP: New music, "now playing" line in debug overlay, and music frequency slider
2022-08-01 17:41:44 +00:00
Isse
cfdc2a8ae6
Add setting to disable flashing lights
2022-07-31 21:53:25 +00:00
Marcel
a9946a491e
Merge branch 'lunareclipse/update-polish-translation' into 'master'
...
Minor update of the Polish translation
See merge request veloren/veloren!3499
2022-07-31 18:28:12 +00:00
Sam
b572c32a4d
Tweaks
2022-07-30 00:18:10 -04:00
LunarEclipse
2a7174a4e6
Minor fixups of the Polish translation
2022-07-27 21:31:10 +02:00
Sam
28a4ce9be1
Various tweaks
2022-07-26 19:44:49 -04:00
Marcel
72b0b26004
Merge branch 'pfau/bg_new' into 'master'
...
new bg
See merge request veloren/veloren!3488
2022-07-22 11:49:57 +00:00
DaforLynx
d2710635d8
Lightning strikes are less audible; cave music restored; fixed audio permanently stopping on logout
2022-07-21 08:27:35 +00:00
Monty Marz
6571068623
new bg
2022-07-19 20:53:06 +02:00
Marcel
35883c61cb
Merge branch 'mckol/update-polish-translation' into 'master'
...
Update the Polish translation
See merge request veloren/veloren!3399
2022-07-17 11:50:50 +00:00
Joshua Barretto
0b16baf46a
Improved rain performance
2022-07-16 14:44:58 +01:00
Treeco
7efddc33f7
Merge branch 'more_humanoid_models' into 'master'
...
Humanoid Model Overhaul
See merge request veloren/veloren!3478
2022-07-16 11:13:24 +00:00
Youssef Fahmy
91c85dea22
Humanoid Model Overhaul
2022-07-16 11:13:24 +00:00
Mckol
8861e12e70
Updated the Polish translation
2022-07-16 13:07:45 +02:00
Joshua Barretto
ea39f78dfd
Minimised rain occlusion problems
2022-07-16 11:14:12 +01:00
Joshua Barretto
b08a501aef
Cleaned up ready for merge
2022-07-16 11:09:35 +01:00
Joshua Barretto
3c5de2991b
More consistent texturing code
2022-07-15 08:43:35 +01:00
Joshua Barretto
9ad32b37e7
More efficient texture fetches
2022-07-15 08:43:34 +01:00
Joshua Barretto
61792d4135
Apply AO
2022-07-15 08:43:34 +01:00
Joshua Barretto
2694f5f917
Fixed lava
2022-07-15 08:43:34 +01:00
Joshua Barretto
07ba4dcc33
Fixed particles for non-body entities, AO for non-volumetric illumination
2022-07-15 08:43:34 +01:00
Joshua Barretto
b5662163f0
Better lighting and verticality in caves
2022-07-15 08:43:33 +01:00
Joshua Barretto
1f979e4133
More biomes
2022-07-15 08:42:56 +01:00
Joshua Barretto
2cce44fc36
Began work on caves2
2022-07-15 08:42:56 +01:00
Joshua Barretto
62d2982990
Made rainbows ultra only
2022-07-15 07:08:30 +00:00
Joshua Barretto
e34f080c91
Fixed unrolling issue in rain shader
2022-07-15 07:06:11 +00:00
Joshua Barretto
964b315fc5
Fixed lightning point glow
2022-07-14 22:12:34 +00: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
5c7ed1e712
Merge branch 'vfoulon80/boat-loading-animation' into 'master'
...
Add a boat loading animation
See merge request veloren/veloren!3474
2022-07-14 07:17:30 +00:00
DaforLynx
194b1866c6
Music, ambience tweaks, and more
2022-07-14 00:55:35 +00:00
Joshua Barretto
f48665366b
More lightning position variety
2022-07-13 21:45:37 +01:00
Vincent Foulon
2240fa4a23
Add a boat loading animation
2022-07-13 22:41:34 +02:00
Christof Petig
5ee72f8a5e
fix test; add tusk, crest, pincer
2022-07-13 20:15:28 +02:00
Joshua Barretto
25c55b6a25
Better rain performance, wetness
2022-07-13 18:34:34 +01:00
Joshua Barretto
4e854a28ff
Fixed occlusion bias
2022-07-10 16:56:45 +01:00
Joshua Barretto
d4906f55bc
Fixed rain occlusion issues
2022-07-10 16:40:49 +01:00
Joshua Barretto
fc21b54f02
Better rain performance
2022-07-10 13:53:31 +01:00
Joshua Barretto
47b236b1f0
Better lightning rates, fixed shaders
2022-07-10 13:44:11 +01:00
Joshua Barretto
3b758cc7b0
Minor colour tweak
2022-07-09 02:25:24 +01:00
Joshua Barretto
85a292a854
Always take origin as lightning end point
2022-07-09 02:16:13 +01:00
Joshua Barretto
6fea7205fa
Better lightning at distance
2022-07-09 02:08:55 +01:00
Joshua Barretto
836fe2b1c6
Proper lightning
2022-07-09 01:59:18 +01:00
Joshua Barretto
edc2720416
Better lightning effect
2022-07-09 00:39:18 +01:00
Joshua Barretto
4531a4e3f9
Added lightning
2022-07-08 23:26:33 +01:00
Joshua Barretto
622b67d24e
Relative offset fix
2022-07-08 20:49:51 +01:00
Joshua Barretto
90d2ceab2e
Fixed rain clipping issue
2022-07-08 20:40:08 +01:00
Joshua Barretto
4b738c8b8f
Balanced rain intensity
2022-07-08 20:22:09 +01:00
Joshua Barretto
6c4b10d881
Use existing humidity
2022-07-08 20:18:07 +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
Joshua Barretto
32fe997506
Use tilted origin for rain
2022-07-08 16:07:15 +01:00
Joshua Barretto
d5c0e878d7
Adjusted depths
2022-07-08 15:09:38 +01:00
Joshua Barretto
eae917ee8f
Use DDA for rain rendering
2022-07-08 14:48:59 +01:00
DaforLynx
fc80a6278c
Fixing looping issues
2022-07-07 16:09:13 -07:00
DaforLynx
bcaa026bff
"Adventurous Soul" plays in Snowland too
2022-07-07 21:26:12 +00:00
DaforLynx
00f1e9c407
Music, reorganization, metadata, and fixes
2022-07-07 04:14:20 +00:00
Julio Cezar Silva
fd34666d03
Portuguese translations parity to global
2022-07-06 07:32:43 +00:00
IsseW
6d8cbe6f0f
remove relative rain direction and increase FALL_RATE
2022-07-04 18:18:43 +02:00
Imbris
e4dfc7729f
Fix rain being visible indoors by making rpos properly line up with where the rain is being drawn and suppressing any leaks of rain occlusion map via flooring the sampled output
2022-07-04 18:18:41 +02:00
IsseW
e7208c9537
make iterations const
2022-07-04 18:18:41 +02:00
Imbris
a5a082cf41
Also use 4 iterations for medium clouds and adjust the factor multiplied by rain_dist each iteration based on the number of iterations so that the last iteration is always the same.
2022-07-04 18:18:40 +02:00
Imbris
b2d3759105
Cleanup profiling comments and commented code
2022-07-04 18:18:39 +02:00
Imbris
b29bad015c
Misc notes in cloud-frag.glsl
2022-07-04 18:18:39 +02:00
Imbris
5866e23e32
Pre-compute view_mat_inv * proj_mat_inv on the CPU before sending to the cloud shader
2022-07-04 18:18:38 +02:00
IsseW
e2969dc5f9
turn off rain for CLOUD_MODE_NONE and adjust iterations
2022-07-04 18:18:38 +02:00
IsseW
80e29e2c20
put rain_density in uniform
2022-07-04 18:18:37 +02:00
IsseW
5b7b13adce
Add medium check to rain
2022-07-04 18:18:36 +02:00
IsseW
a7c724a46d
Limit figures drawn for rain occlusion
2022-07-04 18:18:35 +02:00
DaforLynx
ac82689f83
Clean up audio code, fix egui bug
2022-07-04 18:18:34 +02:00
IsseW
72a0f56788
better rainbows
2022-07-04 18:18:34 +02:00
IsseW
cb969e5b87
Move atan2 to lod.glsl
2022-07-04 18:11:45 +02:00
IsseW
7752696387
pos_to_uv -> wpos_to_uv
2022-07-04 18:11:44 +02:00
DaforLynx
9104a07530
Code cleanup, doubled volume of leaves.ogg
2022-07-04 18:11:43 +02:00
Treeco
0d21361e05
Add player-relative rain direction
2022-07-04 18:11:42 +02:00
IsseW
fa589e915e
make rain view distance smaller, dont put wind in texture
2022-07-04 18:11:41 +02:00
IsseW
fd12c8abdb
Remove dead shader code, clean up weather.rs
2022-07-04 18:10:06 +02:00
DaforLynx
dc8424c549
Moving audio code
2022-07-04 18:10:05 +02:00
IsseW
b82bb5b247
Don't have rain be behind an expiremental shader
2022-07-04 18:07:22 +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
83ee54001e
Ambience slider; fix to utterances
2022-07-04 18:07:15 +02:00
DaforLynx
088d1cfe9d
Remove debug lines, re-mix some sfx, add crafting sfx, separate inv event sfx into spatial and nonspatial
2022-07-04 18:07:13 +02:00
IsseW
234ed5afb2
Rain occlusion projection matrix
2022-07-04 18:07:13 +02:00
Joshua Barretto
295b89d446
Better bias
2022-07-04 18:07:12 +02:00
Joshua Barretto
bfb4769315
Random depth for rain drops for better occlusion
2022-07-04 18:07:11 +02:00
IsseW
79cac935c8
Added rain occlusion
2022-07-04 18:07:11 +02:00
DaforLynx
b3200ed89f
More ambience :)
2022-07-04 18:07:10 +02:00
DaforLynx
16ca1410be
Remove extraneous sfx code
2022-07-04 18:07:08 +02:00
Joshua Barretto
48117988e1
Better rain threshold
2022-07-04 18:07:06 +02:00
Joshua Barretto
767093105f
Rebalanced rain
2022-07-04 18:07:05 +02:00
Joshua Barretto
6093e1972a
Add directional rain back
2022-07-04 18:07:05 +02:00
IsseW
e37f2be820
Put rainbows behind experimental
2022-07-04 18:07:03 +02:00
Joshua Barretto
86814eba04
Made rain look better
2022-07-04 18:07:03 +02:00
Benjam Soule H. Walker
99c76be297
added sound for rain
2022-07-04 18:07:02 +02:00
Joshua Barretto
502145a6f9
Cloud movement is more prominent
2022-07-04 18:07:01 +02:00
Joshua Barretto
dc90d637c1
Smoother clouds
2022-07-04 18:07:01 +02:00
Joshua Barretto
4181331e6b
Balanced rain density
2022-07-04 18:07:00 +02:00
IsseW
273c5ed2f0
Temporary noise solution
2022-07-04 18:07:00 +02:00
IsseW
67683f315f
Put rain behind expiremental shader
2022-07-04 18:06:59 +02:00
IsseW
9c84a20cef
better sim
2022-07-04 18:06:58 +02:00
IsseW
547301ff5f
rainbows
2022-07-04 18:06:57 +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
102156c4b3
Better particle light
2022-07-04 18:11:42 +02:00
IsseW
9cb67e6283
Rain shader
2022-07-04 18:11:41 +02:00
IsseW
b7c0196129
Server weather sim
2022-07-04 18:11:41 +02:00
Samuel Keiffer
0bd08b1f9e
Merge branch 'socksonme/rework_sct' into 'master'
...
Rework SCT
See merge request veloren/veloren!3126
2022-07-02 02:42:42 +00:00
Imbris
6c8970f6fd
Merge branch 'imbris/voxygen-compile-time' into 'master'
...
Improve voxygen compile time with small tweak
See merge request veloren/veloren!3449
2022-07-01 08:22:05 +00:00
Imbris
291a424b4e
This seems to save at least 30 seconds (out of 90 to 120 secs) when tweaking TILE_SIZE in voxygen/src/mesh/greedy.rs (NOTE: I did some more timing, see associated MR description)
2022-06-30 00:11:04 -04:00
Marcel
fddc97bc77
Merge branch 'tweaks' into 'master'
...
tweaks entity stats
See merge request veloren/veloren!3437
2022-06-29 19:29:38 +00:00
Socksonme
f048600335
Add back old i18n + some small fixes
...
- Fix .filter() for combo_floater
- Rename sct_inc_dmg_accum_duration to sct_inc_dmg, as it was in the
wrong place
to rebase
2022-06-29 17:31:58 +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
762b726d21
basic i18n for english + code touchups
...
Getting Invalid Probability error when attacking a lot of enemies - needs to be checked out
2022-06-29 17:31:42 +03:00
juliancoffee
27e67e79ec
(uk_UA) Add abilities translation
2022-06-25 18:19:36 +03:00
juliancoffee
8c837da561
Add i18n keys to abilities
...
* New hud/ability.ron file for ability localizations
* i18n keys are created by adding .name and .desc to ability id. Because
of how i18n worked (returning key if string wasn't found), it was
impossible to do because it leads to UB in case string is missed.
To solve this we've added get_opt method that returns None
* New Localization::get_or method for convinient fallback key usage
2022-06-25 18:17:37 +03:00
runrobdog
7a40ae2db7
tweak entity stats adlet/tracker.ron
2022-06-23 17:48:28 +02:00
runrobdog
16d5ea1e3c
Set stats of entities movesets under the Object(body) tag to pre-modular and change all entities found within dungeons, to pre-modular stats
2022-06-23 06:45:22 +02:00
runrobdog
8c1d4359a8
tweak stats quadmedquick, blackwidow and throped
2022-06-20 14:12:04 +02:00
runrobdog
1dc89fbc58
tweak stats theropodbasic
2022-06-19 19:04:30 +02:00
runrobdog
37137a040f
fix pathing mammoth
2022-06-19 11:25:59 +02:00
runrobdog
25eed55ca9
stat tweaks to theropod, arthropods and basilisk
2022-06-19 01:35:18 +02:00
Sam
1f60bdd452
Removed sticky thread requirement from bow limbs.
2022-06-18 15:19:37 -04:00
runrobdog
10023b0759
tweak entity stats
2022-06-18 12:33:19 +02: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
runrobdog
1e289e6335
tweaks entity stats
2022-06-17 21:48:09 +02:00
runrobdog
1e19f5541b
tweak entity stats
2022-06-17 21:41:04 +02:00
runrobdog
95148a9968
tweaks entity stats
2022-06-17 12:35:06 +02:00
Imbris
b7096d9f2e
Scale shadow grid to multiple texels per grid cell to make it easier to examine
2022-06-05 16:35:12 -04:00
Imbris
9b78d75f06
Add experimental shader option to visualize shadow map texels
2022-06-05 16:35:12 -04:00
terrarier2111
45efdb6602
Implement group owned loot
2022-06-04 17:16:12 +00:00
Christof Petig
f12f79439f
fix negative values for RGB and vary dryness and strength according to biome
2022-06-01 22:13:34 +02:00
Christof Petig
827006e7e0
vary color, strength based on position, color on biome
2022-06-01 22:13:34 +02:00
Christof Petig
6ddedecc05
introduce smoke strength and color
2022-06-01 22:13:34 +02:00
Vlad
90d3157656
Update ru_RU
2022-05-31 18:21:34 +00:00
Sam
2de831cf38
Converted asset files of other armors.
2022-05-30 20:25:33 -04:00
Sam
8b384fd63e
Converted asset files of set armors.
2022-05-30 20:25:33 -04:00
Sam
5e57eabd11
Code changes and msm
2022-05-30 20:25:31 -04:00
Makselord
4a2cdd08d4
modular weapon modifier costs changed to 1, 2, 5, 10, 15, 25
2022-05-30 09:56:17 -04:00
Makselord
f10b868dbf
modular weapon modifier costs changed to 1, 5, 10, 15, 20, 30
2022-05-29 19:50:26 -04: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
Makselord
5c8c88b786
fixed silver, gold, copper, tin ingots not showing correctly in crafting
2022-05-26 17:08:39 -04:00
Marcel
5c2eda64da
Merge branch 'christof/MR3316_reworked' into 'master'
...
MR3316 "Draft: Updated translations" without the directory movement and squashed
See merge request veloren/veloren!3391
2022-05-24 22:10:22 +00:00
Christof Petig
2e6e864672
fix missing comma at line ends
2022-05-24 23:31:20 +02:00
Corvella
a9622fe28e
Add a setting to toggle zooming in when charging bow
2022-05-23 23:09:47 +00:00
Stanisław Grupiński
5ac9c720a1
MR3316 "Draft: Updated translations" without the directory movement and squashed:
...
Renewed Polish translations
Added spaces and change sequences so code fits to English version
2022-05-22 23:01:40 +02:00
Hugo Peixoto
fe11d6d5bc
Split sky shader's twilight into dawn and dusk
...
Instead of having the same color profiles for the sky's color, light,
and halo, we now have the ability to define different values for dawn
and dusk.
The dusk values were unchanged and the dawn values are similar, but with
less red. These should probably be tweaked a bit more.
2022-05-22 19:54:44 +01:00
Marcel
34c12092cc
Merge branch 'Samuellm93-master-patch-97383' into 'master'
...
Update common.ron pt_BR. Added some variables and edited a few.
See merge request veloren/veloren!3387
2022-05-22 13:11:57 +00:00
Euryn
88eaef3145
Add Thai translation
2022-05-22 10:06:36 +00:00
Samuel Lopes Mastrofrancisco
75d109ef6e
Update common.ron pt_BR. Added some variables and edited a few.
2022-05-21 00:11:04 +00:00
Chase Rozon
7dcee3eb23
Multiple Balance Tweaks & Miscellaneous Changes
2022-05-19 22:46:31 +00:00
Youssef Fahmy
080d8ef8b1
Tweaks for this week
2022-05-19 19:35:31 +00:00
Imbris
73244893cc
Merge branch 'update-it_IT' into 'master'
...
Updated the italian translation
See merge request veloren/veloren!3359
2022-05-19 03:51:44 +00:00
Sam
aeca67443b
Simplified item key (assets)
2022-05-18 16:28:10 -04:00
Sam
ba0846d6c7
Addressed more feedback
2022-05-16 15:11:46 -04:00
UncomfySilence
ac124b67a0
minor loot table tweaks and removal of yellow weapon components from caves
2022-05-16 15:11:45 -04:00
Sam
cbf5336343
Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets).
2022-05-16 15:11:45 -04:00
Sam
ad48b634ab
Address feedback (assets)
2022-05-16 15:11:44 -04:00
Sam
254b7964e1
Balance tweaks (assets)
2022-05-16 15:11:43 -04:00
Sam
d6ac9c43d7
More feedback addressed (assets).
2022-05-16 15:11:41 -04:00
Sam
13ea6dee93
Addressed second round of balance feedback (assets).
2022-05-16 15:11:40 -04:00
brunt
d46cdf60b5
renamed hilt voxels, adjusted secondary components in item image manifests [ci_skip]
2022-05-16 15:11:39 -04:00
Sam
9b078c3383
Addressed playtest feedback (assets).
2022-05-16 15:11:38 -04:00
brunt
fc28449703
rotate voxels and sceptre positioning [ci_skip]
2022-05-16 15:11:37 -04:00
UncomfySilence
1c626da66b
loot tables and adding models
2022-05-16 15:11:36 -04:00
Sam
528b62c59a
Rebase commit
2022-05-16 15:11:36 -04:00
Sam
3f2f0a7715
Fixed item drop manifest for secondary components.
2022-05-16 15:11:36 -04:00
Sam
efc0189548
Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (assets).
2022-05-16 15:11:34 -04:00
Sam
49ff094286
Addressed most review comments (assets).
2022-05-16 15:11:33 -04:00
brunt
5ab9c0f1ad
sceptre positioning [ci_skip]
2022-05-16 15:11:32 -04:00
Sam
6ccc0b82f0
Models for sceptres and secondary components
2022-05-16 15:11:32 -04:00
Monty Marz
c3f92622c1
bg icons
2022-05-16 15:11:29 -04:00
Bryant Deters
af1a44264a
add melee weapons to item_drop_manifest [ci skip]
2022-05-16 15:11:29 -04:00
Bryant Deters
4edd041056
add staffs to item_drop_manifest [ci skip]
2022-05-16 15:11:29 -04:00
Bryant Deters
1ce474adbb
modular bow offset tweaks [ci skip]
2022-05-16 15:11:28 -04:00
Bryant Deters
f767e81133
modular staff offsets [ci skip]
2022-05-16 15:11:28 -04:00
Sam
e8c97f7a00
Staff models
2022-05-16 15:11:27 -04:00
Bryant Deters
f1940128bf
modular bow offset adjustments [ci skip]
2022-05-16 15:11:27 -04:00
Bryant Deters
075fee5190
modular component tooltips
2022-05-16 15:11:25 -04:00
Snowram
f6343ff4f9
Modular bows offsets
2022-05-16 15:11:24 -04:00
Sam
558e2aefb7
Bow models
2022-05-16 15:11:23 -04:00
Sam
eec0ba18a9
Fixed eldwood recipes returning frostwood components.
2022-05-16 15:11:22 -04:00
Sam
d436362a8d
Consolidated crafting UI for the primnary component of modular weapons.
2022-05-16 15:11:21 -04:00
Snowram
74a3f4a7dc
Modular 1h weapons offsets
2022-05-16 15:11:21 -04:00
Sam
3702952f99
Added recipes for each material kind.
2022-05-16 15:11:20 -04:00
Sam
ef5b2e4a1e
Added method of differing names for 1h and 2h variants of a modular wepaon.
...
Added all 1h melee weapon models.
2022-05-16 15:11:19 -04:00
Monty Marz
3d5e29b44d
Ui
2022-05-16 15:11:18 -04:00
Sam
1c0154487a
Rebase fixes.
2022-05-16 15:11:18 -04:00
Sam
94c19735ca
Fixed broken stuff during rebase.
2022-05-16 15:11:16 -04:00
Sam
5c28e3cb25
Items with components can now have their name modified by the components. Also addressed more review. ONLY ASSETS
2022-05-16 15:11:16 -04:00
Sam
524845b661
Addressed more comments on MR.
2022-05-16 15:11:15 -04:00
Sam
d7f5b907ff
Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. ONLY ASSETS
2022-05-16 15:11:14 -04:00
Sam
eecc1b42c3
Fixed regex mistake in changing name of item assets.
2022-05-16 15:11:13 -04:00
Sam
62632318fe
Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. ONLY ASSETS
2022-05-16 15:11:12 -04:00
Sam
b048179c0a
Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS.
2022-05-16 15:11:11 -04:00
Sam
03ab68eb60
Added models for sword blade, axe head, and hammer head components.
2022-05-16 15:11:09 -04:00
Sam
2aad3f3961
Switched to item list as an input for modular components so that allowed items could be centralized.
2022-05-16 15:11:08 -04:00
Snowram
b01e816c0d
Modular axes and hammers offsets
2022-05-16 15:11:08 -04:00
Snowram
e693b3132d
Modular swords offsets
2022-05-16 15:11:07 -04:00
