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
847ee1c1b1
Implement i18n-tooling
...
* Working csv export
* Working i18n-check
2022-08-17 22:46:48 +03:00
Joshua Barretto
dfe2e1c085
Merge branch 'AldanTanneo/discord-presence' into 'master'
...
Discord Activity
See merge request veloren/veloren!3529
2022-08-15 15:58:38 +00:00
AldanTanneo
ba87a405af
Discord Activity
2022-08-15 15:58:37 +00:00
IsseW
911be0113d
camera movement changes
2022-08-14 22:41:08 +02:00
IsseW
f77cce68d5
fix viewpoint meshing
2022-08-14 22:41:08 +02:00
IsseW
9b7a67c80e
fix viewpoint rotation
2022-08-14 22:41:07 +02:00
IsseW
689376ec70
save spectate position
2022-08-14 22:41:07 +02:00
DaforLynx
daadf3abdb
Gnarling Fort music; more specific sites; fix music spacing; new sfx
2022-08-14 01:57:58 +00:00
IsseW
50274fbc0c
add newline to flashing lights option
2022-08-12 20:30:32 +02:00
Samuel Keiffer
a1b5f53d15
Merge branch 'craft-all' into 'master'
...
Craft all
See merge request veloren/veloren!3525
2022-08-12 00:47:48 +00:00
Julio Cezar Silva
9315482fc4
Craft all
2022-08-12 00:47:48 +00:00
Isse
e81dade43f
Fix compilation with worldgen turned off.
2022-08-11 20:27:25 +00:00
Joshua Barretto
52bd7b2485
Added automod
2022-08-11 11:09:52 +01:00
Imbris
2d2d6b5c64
Merge branch 'DaforLynx/music-gap-fix' into 'master'
...
Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing
See merge request veloren/veloren!3528
2022-08-11 02:56:40 +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
Julio Cezar Silva
177fbcb0bc
Login screen's first detected tab triggers username focus
2022-08-11 00:12:42 +00:00
Marcel
c2847bbbf2
Merge branch 'juliancoffee/boost-skills-ui' into 'master'
...
Force no digits after dot printing for boosts
See merge request veloren/veloren!3523
2022-08-09 22:29:20 +00:00
juliancoffee
02c78c28f4
Force no digits after dot printing for boosts
2022-08-10 01:06:17 +03: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
juliancoffee
56dc490903
Fix tutorial key i18n
2022-08-09 18:31:46 +03:00
juliancoffee
fe1ea00246
Fix died_of_buff typo bug
2022-08-09 14:40:26 +03:00
Imbris
d5b59c2bb7
Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage
2022-08-08 00:38:20 -04: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
juliancoffee
38d3bdeeee
Pre-merge activity
...
* Add CHANGELOG
* Remove script to convert .ron files to .ftl files
2022-08-07 20:42:33 +03:00
Tavo Annus
8a132d0726
Add zoom cap to admin to keep zoom in a sensible range
...
By clamping zoom, panic due to float overflow is avoided
Regular player zoom cap is also reduced to a more sensible range
2022-08-07 20:04:07 +03:00
juliancoffee
eed5aef1d0
fix wording
2022-08-07 18:09:30 +03:00
juliancoffee
67df7a1e74
fmt
2022-08-07 16:45:18 +03:00
juliancoffee
445b748e1a
Improve ability i18n algorithm
2022-08-07 16:21:58 +03:00
juliancoffee
c10f722e25
Improve loading-tips args
2022-08-07 16:21:58 +03:00
juliancoffee
05caa2d3a8
Fix rebase error
2022-08-07 16:21:58 +03:00
juliancoffee
e22babc51b
Improve error diagnostic in LocalizationHandle
2022-08-07 16:21:58 +03:00
juliancoffee
f2df1adf27
Improve documentation
2022-08-07 16:21:58 +03:00
juliancoffee
c38d94e504
Refactor try_variaton and error handling in i18n
2022-08-07 16:21:53 +03:00
juliancoffee
b5436872ed
Adress review, remove redundant .into_owned
2022-08-07 13:54:58 +03:00
juliancoffee
94dbd4cb25
Respond to review, make char_slider take String
2022-08-07 13:38:36 +03:00
DaforLynx
9a8c288580
Lower volume of river sfx
2022-08-06 21:29:38 +00:00
juliancoffee
d000cc90a1
Migrate code to new i18n API
2022-08-06 21:56:01 +03:00
juliancoffee
8ba50e62d5
New i18n implementation based on Fluent
2022-08-06 21:45:23 +03: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
Sam
ea0192b7e3
Tweaked tooltips so that item name and kind are next to image, to reduce amount of empty space.
2022-07-30 11:38:28 -04:00
Sam
29dd9eac9b
Remvoed CR from UI. Changed all stats in tools and armor to be same size. Cleaned up item stats UI code.
2022-07-28 19:19:20 -04:00
Marcel Märtens
bfcc2cb802
Change the version number to 0.13
2022-07-23 14:06:08 +02:00
John Heath
edc10519c6
fix for #1604 : use correct values in calculation
2022-07-21 18:34:06 +01: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
Avi Weinstock
7f6ba8e492
Closing a subwindow (such as inventory or the list of online players) only regrabs the cursor if no other subwindow requires it.
...
Fixes #1116 .
2022-07-17 14:58:02 -04:00
Forest Anderson
67534488b3
Merge branch 'tygyh/CleanUp' into 'master'
...
Tygyh/clean up
See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
Joshua Barretto
79ad06ab60
Early light filter
2022-07-16 15:54:12 +01:00
Joshua Barretto
cda6c031b8
Limit number of minor lights applied to entities to solve performance problems
2022-07-16 15:39:06 +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
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
tygyh
9f6df715e7
Readd needed qualifiers
2022-07-15 19:36:36 +02:00
tygyh
120ee6b6c0
Fix typos
2022-07-15 18:59:37 +02:00
tygyh
abdd5e3906
Lift return out of if-statements
2022-07-15 16:36:11 +02:00
tygyh
25e20b5fa0
Remove unecesssary lifetimes
2022-07-15 16:20:15 +02:00
tygyh
fb7bdd8bf8
Fix deprecated imports
2022-07-15 16:17:19 +02:00
tygyh
fefe745508
Reorder impl member order to match trait member order
2022-07-15 15:54:32 +02:00
tygyh
5e5698249b
Remove unnecessarily qualified paths
2022-07-15 14:49:46 +02: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
59655451c9
Made particle spawning use interpolated position
2022-07-15 08:42:56 +01: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
DaforLynx
194b1866c6
Music, ambience tweaks, and more
2022-07-14 00:55:35 +00:00
Isse
1e3b5383cf
Merge branch 'zesterer/better-rain' into 'master'
...
Better rain
See merge request veloren/veloren!3464
2022-07-13 23:25:33 +00:00
Joshua Barretto
f48665366b
More lightning position variety
2022-07-13 21:45:37 +01:00
Christof Petig
5bbb73bc17
changelog + remove dead code, but the test still fails
2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403
use ItemDefintionId across trade_pricing
2022-07-13 20:15:27 +02:00
Avi Weinstock
27d2cdeb79
WIP modular weapon pricing.
2022-07-13 20:15:27 +02:00
Joshua Barretto
25c55b6a25
Better rain performance, wetness
2022-07-13 18:34:34 +01:00
Marcel
80d491f003
Merge branch 'socksonme/small_fixes' into 'master'
...
Small fixes
See merge request veloren/veloren!3465
2022-07-12 21:01:47 +00:00
Socksonme
3f0f1c423c
Small fixes
2022-07-12 21:01:47 +00:00
Awkor
6233db8682
Bump shaderc version to 0.8.0
2022-07-10 21:46:30 +02:00
Joshua Barretto
d4906f55bc
Fixed rain occlusion issues
2022-07-10 16:40:49 +01:00
Ben Wallis
af04843a20
Re-enabled mimalloc for non msvc builds
2022-07-10 14:50:35 +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
6d1b46956d
Better storms
2022-07-09 00:14:59 +01:00
Joshua Barretto
6796fe2745
Better lightning attenuation
2022-07-08 23:45:08 +01:00
Joshua Barretto
4531a4e3f9
Added lightning
2022-07-08 23:26:33 +01:00
DaforLynx
0d1bf3efe6
fmt
2022-07-07 16:10:51 -07:00
DaforLynx
fc80a6278c
Fixing looping issues
2022-07-07 16:09:13 -07:00
DaforLynx
00f1e9c407
Music, reorganization, metadata, and fixes
2022-07-07 04:14:20 +00:00
Marcel
7ae65f2c13
Merge branch 'windows-gnu-linking-fix' into 'master'
...
Disable mimalloc for non msvc builds
See merge request veloren/veloren!3460
2022-07-06 20:21:25 +00:00
Isse
7e18384e1c
Disable mimalloc for non msvc builds
2022-07-06 19:08:19 +02:00
Marcel Märtens
e4909650e1
update hashbrown, specs, and tracy
2022-07-06 15:41:59 +02:00
IsseW
5a0cdc2528
add rain threshold that depends on chunk moisture
2022-07-04 18:18:43 +02:00
IsseW
6d8cbe6f0f
remove relative rain direction and increase FALL_RATE
2022-07-04 18:18:43 +02:00
IsseW
6562c7076f
remove fluid model todo
2022-07-04 18:18:42 +02:00
Imbris
b2d3759105
Cleanup profiling comments and commented code
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
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
ab707b6df1
sample weather at correct position for occlusion
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
9f26afb4a5
refactor rain_dir to rain_vel
2022-07-04 18:11:45 +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
DaforLynx
dc8424c549
Moving audio code
2022-07-04 18:10:05 +02:00
IsseW
6215ccd522
Remove dead code
2022-07-04 18:07:24 +02:00
DaforLynx
05e7de5629
Adjust some values for ambience volume
2022-07-04 18:07:23 +02:00
IsseW
b82bb5b247
Don't have rain be behind an expiremental shader
2022-07-04 18:07:22 +02:00
IsseW
6274d54e56
fix todos
2022-07-04 18:07:21 +02:00
IsseW
a93240d2a6
cleaner get_ambient_channel
2022-07-04 18:07:20 +02:00
IsseW
3eabe24f12
base occlusion texture size of off voxels
2022-07-04 18:07:19 +02:00
DaforLynx
a6fd5d5c8b
Some organization. Faster volume lerping.
2022-07-04 18:07:19 +02:00
IsseW
08b0989789
add slider for rain map resolution
2022-07-04 18:07:18 +02:00
DaforLynx
6059a30f27
Rain diminishes with distance above terrain
2022-07-04 18:07:16 +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
365f45397b
At this point all sfx should be able to detect underwater
2022-07-04 18:07:14 +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
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
c4239e074f
Prevent unnecessary running of code
2022-07-04 18:07:09 +02:00
DaforLynx
aafd13508d
Completely redoing ambient sound again.
2022-07-04 18:07:08 +02:00
DaforLynx
16ca1410be
Remove extraneous sfx code
2022-07-04 18:07:08 +02:00
DaforLynx
ca815f25a1
merging some UI sfx from a now-dead branch
...
Merge part 2
merge part 3
Merge part 4
merge part 5
2022-07-04 18:07:07 +02:00
IsseW
b578f0231f
Interpolate in client
2022-07-04 18:07:06 +02:00
IsseW
4fa2644507
Interpolate weather in voxygen
2022-07-04 18:07:04 +02:00
IsseW
e37f2be820
Put rainbows behind experimental
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
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
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
b7c0196129
Server weather sim
2022-07-04 18:11:41 +02:00
Isse
16c5c657cc
Fix mimalloc for hot reloading
2022-07-04 10:08:27 +00:00
IsseW
57d6b4a55f
Switch to mimalloc on windows
2022-07-04 09:15:18 +02:00
Imbris
54f6f278a0
Include an associated Config type in the atlas trait which is provided when creating the atlas
2022-07-01 23:47:42 -04:00
Imbris
95f17a6d22
General cleanup, remove local dependency, switch to u16 from i32 in several places, avoid guillotiere types in atlas API (one spot still remains)
2022-07-01 23:47:42 -04:00
Imbris
16461cfcba
Cleanup atlas allocator work, remaining TODO:
...
* refactor meshing and trait API to replace guillotiere types
* associated config type on atlas trait
* investigate other areas of sprite performance like LOD scaling (i.e.
there are now significant gaps in between meshing)
2022-07-01 23:47:41 -04:00
Imbris
5e5f7885e5
Tiled guillotiere allocator for sprites working
2022-07-01 23:47:41 -04:00
Imbris
b1f5fc01db
Before removing variable size edge tiles
2022-07-01 23:47:41 -04: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
e9ed7007ec
Convert hashmap to array of SpriteConfigs to ensure we keep quick lookup times since this is queried for every block when processing a new chunk,
2022-07-01 03:34:35 -04: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
Socksonme
6a355c58f2
Remove instance from PoiseChange
2022-06-29 18:36:05 +03:00
Socksonme
da0baa674f
Remove hp_floaters whenever they wouldn
2022-06-29 17:31:59 +03:00
Socksonme
b7a718cb99
Remove old comments
2022-06-29 17:31:58 +03: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
f6189a61f2
Address review - addendum
...
- `BlockFloater`s and `ComboFloater`s don't store the owner anymore,
`ExpFloater` still does, however the field is used to prevent
accumulating old floaters with new ones. This change also makes it so
that if the client changes entity, they keep the old entity's
floaters.
- The `combo_floaters` field is now `combo_floater` plus it now uses an
Option<ExpFloater>.
- Changed `handle_health_change` to change the health even if the entity
does not have a `Pos` or `Uid`, now uses `emit_now`combo_floater` plus
it now uses an Option<ExpFloater>.
- Changed `handle_health_change` to change the health even if the entity
does not have a `Pos` or `Uid`, now uses `emit_now`
- Changed some comments
2022-06-29 17:31:58 +03:00
