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
13,705 Commits 151 Branches 18 Tags 2.1 GiB
458acce5ac
Commit Graph

5026 Commits

Author SHA1 Message Date
juliancoffee
34c5e95d8a Add Energy regen buff 
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
 2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef Merge branch 'creature_model_updates' into 'master' 
Creature model updates

See merge request veloren/veloren!3584
 2022-09-06 10:35:11 +00:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
Imbris
9dbff4c342 [voxygen] Disable editing server address if it is supplied via CLI and hide server list button (with an unlock button to re-enable editing) 2022-09-03 20:24:50 -04:00
Imbris
1888863915 Add CLI argument to voxygen that allows specifying a value to place into the server field in the main menu. 2022-09-03 17:26:07 -04:00
LunarEclipse
be9e0497d1 Fixed the ambience volume ui element positions 2022-09-03 21:56:25 +02:00
LunarEclipse
24c50fab3b Updated the code to use the new hover icons 2022-09-03 21:56:25 +02:00
LunarEclipse
36167f2e3a Renamed some files, added missing img_ids. 2022-09-03 21:56:25 +02:00
Mckol
e9ba3ffa4a Added the possibility to not assign a default keybind to a GameInput 2022-09-03 21:56:00 +02:00
Mckol
e4b213cac5 Added a keybind for muting the music [F8] 2022-09-03 20:33:08 +02:00
Mckol
6605c2657f Added mute buttons for all of the audio sliders in settings 2022-09-03 20:31:04 +02:00
Yusuf Bera Ertan
7a2d647400
build(nix): wrap veloren-voxygen in wrapper derivation 2022-09-03 07:12:18 +03:00
Yusuf Bera Ertan
1ca6ebdda0
build(nix): add missing library for voxygen 2022-09-03 03:34:10 +03:00
Yusuf Bera Ertan
5b901d9775
build(nix): update flake lock, fix stuff 2022-09-02 21:13:57 +03:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
juliancoffee
b892e00699 Fix hud-skill-sc_wardaura_duration key 2022-08-30 00:49:40 +03: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
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
Joshua Yanovski
6032dbd22a Merge branch 'seachapel_fixes' into 'master' 
seachapel_fixes

See merge request veloren/veloren!3572
 2022-08-27 08:03:04 +00:00
flo666
eae1c5ff69 set difficulty indicator to 4 2022-08-27 08:11:35 +02: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
37caab539c Replace uses of "65" with client::MAX_SELECTABLE_VD in client and 
voxygen crates.
 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
Imbris
895d6a2d8b Impove UX of server limits on the view distance 
* When client gets its view distance set by the server it stores that as
  the max view distance allowed by the server.
* This is used to avoid skip sending requests if `set_view_distance` is
  called with larger values.
* This is then also displayed in the UI via greying out the slider when
  it goes past the limit and drawing another slide at the limit.
* The server clamping the client's view distance no longer leads to
  edits in voxygen's view distance settings (the view distance setting
  is instead preserved).
 2022-08-25 23:24:43 -04:00
flo666
b1176aa9d3 set difficulty indicator to 3 2022-08-25 16:32:31 +02:00
Ben Wallis
a00a92def1 Merge branch 'juliancoffee/fix-i18n-keys' into 'master' 
Fix i18n keys

See merge request veloren/veloren!3567
 2022-08-25 14:15:21 +00:00
juliancoffee
49e8cec5eb Fix i18n keys 2022-08-25 16:30:26 +03:00
juliancoffee
ae399b3c7c Remove cfg(feature = stat) for localization test 2022-08-25 14:23:27 +03:00
juliancoffee
f2eb1fe7c8 Make i18n csv own binary 
* Put file that needs care back into csv
 2022-08-25 14:23:26 +03:00
juliancoffee
9a0ac8dcce Make test_all_localizations run at unittest 2022-08-25 13:18:06 +03:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
Imbris
2f24da7339 Merge branch 'parzivale/issue-#1652-Remove-i18n-keys' into 'master' 
Parzivale/issue #1652 remove i18n keys

Closes #1652

See merge request veloren/veloren!3560
 2022-08-24 19:17:09 +00:00
parzivale
1fb981a09a updated header_i18n_key 2022-08-24 17:19:23 +02:00
parzivale
e456137b4c updated icon_button_tooltip to new format 2022-08-24 16:52:08 +02:00
parzivale
feca285665 ammended code quality issues from last commit 2022-08-24 16:29:42 +02:00
parzivale
06f5aa70f0 removed unecesarry .replace in dairy.rs 2022-08-24 16:16:30 +02:00
parzivale
0ca2e64772 formtaed code with cargo fmt 2022-08-23 19:18:18 +02:00
parzivale
e7f472059d tidied up code 2022-08-23 14:23:31 +02:00
parzivale
a3388bdd2e final cleanup for issue #1652 2022-08-23 13:35:16 +02:00
parzivale
cf09348306 second cleaning pass after removing i18n.get 2022-08-23 13:14:29 +02:00
parzivale
4a71698048 removed i18n.get 2022-08-23 11:19:39 +02:00
parzivale
9e22ae01a0 finished first pass removing i18n.get 2022-08-23 11:17:21 +02:00
parzivale
16a3794686 in the process of cleaning up i18n.gte calls 2022-08-23 10:04:21 +02:00
Imbris
5e8adb3c80 Make the present mode default to Fifo instead of Immediate since it uses 
less power and in my own experience is generally a better experience when
the GPU is under significant load.
 2022-08-23 02:17:39 -04:00
DaforLynx
656727ecbd Miscellaneous audio fixes 2022-08-21 05:32:02 +00:00
Marcel
e4c9634b76 Merge branch 'juliancoffee/workaround-isolation-marks' into 'master' 
Don't produce isolation marks in fluent

See merge request veloren/veloren!3553
 2022-08-20 13:16:25 +00:00
Marcel
cafef52b01 Merge branch 'socksonme/fix_coverage_shell_script' into 'master' 
Fix coverage shell script

See merge request veloren/veloren!3552
 2022-08-20 13:14:32 +00:00
juliancoffee
64c909cba0 Don't produce isolation marks in fluent 2022-08-20 13:36:16 +03:00
Socksonme
0e5b472d1d Fix sed regex 2022-08-19 19:45:22 +03: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
Imbris
ca928a9fec Merge branch 'juliancoffee/fix-convert-to-unicode' into 'master' 
Resurrect convert_utf8_to_ascii

See merge request veloren/veloren!3548
 2022-08-18 23:23:34 +00:00
juliancoffee
f104085a85 Adress review 
1) Add NOTE about brute-force deunicode
2) Fix ut8 -> utf8 typo in comment
 2022-08-19 01:46:41 +03:00
juliancoffee
d26422dc29 Resurrect convert_utf8_to_ascii 2022-08-19 00:09:39 +03:00
Marcel Märtens
fdaaa24338 fix coverage 2022-08-18 09:00:16 +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
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
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
8feaea5cdf Exp floater accumulation + ignore all below 0.1 2022-06-29 17:31:57 +03:00
socksonme
eabbfe6a51 Remove damage batch option + crit_mult 2022-06-29 17:31:54 +03:00
socksonme
29ce64b4f5 Small changes to hud 2022-06-29 17:31:43 +03:00
socksonme
0e84794217 change font size formula to not use crit_mult + use ints for change by check 2022-06-29 17:31:43 +03:00
socksonme
3d2dcbf894 Revert some changes 2022-06-29 17:31:43 +03:00
socksonme
559d5ca804 Some changes to DamageSources + various code qual changes 2022-06-29 17:31:43 +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
socksonme
ddf0ba6dd6 Small UI changes + fix hurt animation 2022-06-29 17:31:41 +03:00
socksonme
5533d139bc Slider for accumulated damage duration 2022-06-29 17:31:41 +03:00
socksonme
5360a7c93e Tons of code quality changes, added damage rounding option 2022-06-29 17:31:37 +03:00
socksonme
64f0f05608 Fixed bug with healing above 5.0 and preparing for options 2022-06-29 17:31:10 +03:00
socksonme
202d558246 Instance number generated inside projectile constructor, remove crit field 2022-06-29 17:31:07 +03:00
socksonme
6c75ad6ef8 Code quality changes and comments 2022-06-29 17:30:54 +03:00
socksonme
c0e78d869e Instance numbers are now based on the AttackDamage struct 2022-06-29 17:30:53 +03:00
socksonme
ac5bf53c42 Instance numbers for HpChanges 2022-06-29 17:30:50 +03:00
socksonme
f8924d6c1a tweaks to damage floaters 
Added some comments where stuff needs to be discussed
 2022-06-29 17:30:32 +03:00
socksonme
7a1e19d42c Crits now only glob with eachother, now show up like healing 
Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later
 2022-06-29 17:30:29 +03:00
socksonme
ce95680df9 Addressed comments, health and damage floaters are now separated 
Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed
 2022-06-29 17:29:59 +03:00
socksonme
94f193fbe0 Damage outcomes are now emitted with health change events 
Being healed and damaged at the same time still leads to issues - needs to be sorted out
 2022-06-29 17:29:19 +03:00
socksonme
634a3095d6 Handling crits (very bad color choice+naming) 2022-06-29 17:24:05 +03:00
socksonme
93d3ce18b4 Remove dbgs and temporary? 0.0 damage fix 2022-06-29 17:24:05 +03:00
socksonme
aee7888a92 HpFloaters are now created by Outcomes, touched up Damage Outcome 2022-06-29 17:24:05 +03:00
socksonme
bf6c6fb33d Changed Damage Outcome to store more data 2022-06-29 17:24:05 +03:00
juliancoffee
3e73fba165 Better naming for shortened key functions 
* Old display_shortened that returned Option is now called try_shortened
* What was called try_shortened is now just display_shortest, because if
  shortened version isn't available, it means that regular version is
  already shortened.
 2022-06-26 21:59:36 +03:00
juliancoffee
3d1b2735a2 Clean i18n lifetimes 2022-06-26 00:44:55 +03:00
juliancoffee
9d928261cb Try to display shortened version of key in diary 
* Make try_shortened method that tries shortened version of key or
  regular version if shortened one isn't available
* Use it in most places where display_shortened + display_string were
  used
* Use it for diary skilbar
 2022-06-25 18:17:37 +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
Ben Wallis
be02e3ced0 Fixed title screen FPS cap not being applied correctly when background FPS is set to unlimited 2022-06-19 14:04:36 +01:00
IsseW
c7a6955565 fix 2022-06-18 15:25:55 +02:00
Samantha W
57ab1c5767 Add a client-side mutelist 2022-06-14 20:35:01 +00:00
Imbris
9b78d75f06 Add experimental shader option to visualize shadow map texels 2022-06-05 16:35:12 -04:00
Imbris
be1cc1b983 Add a few pieces of documentation to code related to light and shadows 2022-06-05 16:35:12 -04:00
terrarier2111
45efdb6602 Implement group owned loot 2022-06-04 17:16:12 +00:00
Christof Petig
589ceb6d38 avoid one allocation, spotted by imbris 2022-06-01 22:47:53 +02:00
Christof Petig
3cc88f9b1d move temp and humidity out of array, introduce different smoke types 2022-06-01 22:14:23 +02:00
Christof Petig
bf3eef6e1a remove dead use 2022-06-01 22:14:23 +02:00
Christof Petig
dd28dc81be humidity + clean up 2022-06-01 22:13:35 +02:00
Christof Petig
92ab095480 test and fix temperature handling 2022-06-01 22:13:35 +02:00
Christof Petig
59d876a654 pass humidity to meta, move smoke cycle to separate file 2022-06-01 22:13:34 +02: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
Sam
5e57eabd11 Code changes and msm 2022-05-30 20:25:31 -04:00
N A
c09f070241 Change animal species to have only one inventory slot 2022-05-29 23:53:00 +00:00
Benoît du Garreau
6431c5567c Fix clippy error 2022-05-28 23:58:47 +02:00
Benoît du Garreau
f36e74e383 Fix deprecated function use 2022-05-28 23:53:30 +02:00
Benoît du Garreau
ca2ef3e813 Add comments 2022-05-28 23:32:16 +02:00
Benoît du Garreau
8488c7b25e Upgrade assets_manager to 0.8.0 and image to 0.24 
This removes a significant number of duplicated dependencies
 2022-05-28 23:18:31 +02:00
Ben Wallis
d56e0de392 Merge branch 'xvar/fix-charselect-bug' into 'master' 
Fixed handling of deleted characters on character select screen

Closes #1560

See merge request veloren/veloren!3408
 2022-05-28 18:12:49 +00:00
Ben Wallis
c001de7409 Fixed pressing enter on character creation screen attempting to log in instead of create the character. Fixed deleting a character with no characters remaining resulting in the deleted character still being selected internally. 2022-05-28 16:28:26 +01: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
Imbris
ca1a27bd11 Merge branch 'imbris/update-tracy' into 'master' 
Update tracy

See merge request veloren/veloren!3400
 2022-05-27 02:50:24 +00:00
Imbris
5cf899c4fe Plot fixes in client and dynamic name fix in voxygen (tracy update) 2022-05-26 22:19:11 -04:00
Imbris
a366fc4512 Update tracy 2022-05-26 00:04:03 -04:00
Marcel
fb6a8e0360 Merge branch 'xMAC94x/network_error' into 'master' 
Pass network errors through the stack to display them in logs

See merge request veloren/veloren!3385
 2022-05-25 22:12:42 +00:00
Samuel Keiffer
b9c324a183 Merge branch 'tame_and_mount_special_casing' into 'master' 
Special case taming and mounting.

See merge request veloren/veloren!3354
 2022-05-24 02:09:45 +00:00
N A
d84a26dfd8 Special case taming and mounting. 2022-05-24 02:09:45 +00:00
Corvella
a9622fe28e Add a setting to toggle zooming in when charging bow 2022-05-23 23:09:47 +00:00
Marcel Märtens
fc735f509e fix a unrelated clippy issue that came up suddenly 2022-05-23 09:20:54 +02:00
Imbris
50c34e56ce Merge branch 'chucksys/chat-opacity-text' into 'master' 
Add chat window opacity value alongside slider

See merge request veloren/veloren!3377
 2022-05-19 03:48:20 +00:00
Sam
534c7dc8b9 Simplified item key (no assets) 2022-05-18 16:28:06 -04:00
Sam
46fe8604b7 Added search filtering to modular entries in crafting UI 2022-05-16 15:11:46 -04:00
Sam
066b8ef9fd Address feedback (no assets) 2022-05-16 15:11:43 -04:00
Sam
85c2a85817 Addressed review comments 2022-05-16 15:11:42 -04:00
Sam
13ea6dee93 Addressed second round of balance feedback (assets). 2022-05-16 15:11:40 -04:00
Sam
c0dd748bc7 Addressed second round of balance feedback (no assets). 2022-05-16 15:11:40 -04:00
Sam
95c3fdffa1 Addressed playtest feedback (no assets). 2022-05-16 15:11:39 -04:00
Sam
1b85258838 Crafting slots now properly check component recipe book to see if an input is valid. 2022-05-16 15:11:35 -04:00
Sam
64d07d02c4 Changed item definition id to better handle modular items. 2022-05-16 15:11:34 -04:00
Sam
37442b638c Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets). 2022-05-16 15:11:33 -04:00
Sam
afd2c8730f Addressed most review comments (no assets). 2022-05-16 15:11:32 -04:00
Bryant Deters
777fcdf477 closing crafting menu clears crafting components in modular recipe [ci_skip] 2022-05-16 15:11:31 -04:00
Bryant Deters
cabde522b0 cleanup commented line [ci_skip] 2022-05-16 15:11:31 -04:00
Bryant Deters
0d4b05b256 text margin fix, removed some mutable variables, can_perform for modulars accounts for crafting sprites [ci skip] 2022-05-16 15:11:30 -04:00
Sam
f6bf8206ab Use new icons from Pfau 2022-05-16 15:11:30 -04:00
Monty Marz
c3f92622c1 bg icons 2022-05-16 15:11:29 -04:00
Sam
fceb48c3ac Removed vec allocation for component recipe iterators 2022-05-16 15:11:26 -04:00
Sam
a5a517916e Initial UI including ingredients in crafting modular components 2022-05-16 15:11:25 -04:00
Sam
085b18c07a Formatting tweaks to tooltips 2022-05-16 15:11:25 -04:00
Bryant Deters
075fee5190 modular component tooltips 2022-05-16 15:11:25 -04:00
Sam
d436362a8d Consolidated crafting UI for the primnary component of modular weapons. 2022-05-16 15:11:21 -04:00
Sam
5877334ed3 Tags are now generated for modular items. 2022-05-16 15:11:20 -04:00
Sam
aeac0f5ad6 Modular inputs now have tooltips. 2022-05-16 15:11:19 -04:00
Monty Marz
3d5e29b44d Ui 2022-05-16 15:11:18 -04:00
Sam
360e12be22 UI can display a preview of the modular weapon output. 2022-05-16 15:11:17 -04:00
Sam
8fc0138e84 Initial crafting UI for modular weapons. 2022-05-16 15:11:17 -04:00
Sam
bf348b7f43 Addressed further review. 2022-05-16 15:11:16 -04:00
Sam
94c19735ca Fixed broken stuff during rebase. 2022-05-16 15:11:16 -04:00
Sam
81c83c5e83 Items with components can now have their name modified by the components. Also addressed more review. NO ASSETS 2022-05-16 15:11:15 -04:00
Sam
524845b661 Addressed more comments on MR. 2022-05-16 15:11:15 -04:00
Sam
259db56ca6 Addressed more comments in MR review. 2022-05-16 15:11:14 -04:00
Sam
a9e9a70687 Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. NO ASSETS 2022-05-16 15:11:11 -04:00
Sam
b048179c0a Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS. 2022-05-16 15:11:11 -04:00
Sam
08b7bb781f Changed Item to have ItemBase instead of ItemDef. NO ASSETS. 2022-05-16 15:11:10 -04:00
Sam
5bacf526ad Began addressing initial review of modular weapons. 2022-05-16 15:11:10 -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
Sam
38cb465722 Fixed loading of modular weapons from the loadout to work with nested components. 
Modular weapons can now be correctly dispalyed when wielded.
 2022-05-16 15:10:57 -04:00
Sam
0a38567e8d Modular weapons can now be properly displayed in the inventory. 2022-05-16 15:10:57 -04:00
Sam
762b3be3c3 Modular weapons can now be dropped as loot or assigned to enemies. 2022-05-16 15:10:56 -04:00
Sam
c01fe655f1 Added wood 2022-05-16 15:10:55 -04:00
Sam
d380a2dbaf Quality is now propogated through modular items from the quality of the components. 2022-05-16 15:10:55 -04:00
Monty Marz
c5b79021f8 Fix wrapping for ingredients text 2022-05-16 15:10:54 -04:00
Sam
405b9b2448 Modular weapons now have programmatically generated names. 2022-05-16 15:10:53 -04:00
Sam
4e89bc7485 Added test functions to assist in fixing unit tests that broke from changed functionality. 2022-05-16 15:10:52 -04:00
Sam
6620c1dd1f Added HandsKind to automatically resolve handedness of modular weapons. 2022-05-16 15:10:51 -04:00
Sam
85b7382487 Added handedness requirements to recipes and components. 2022-05-16 15:10:50 -04:00
Sam
77934c9214 Made changes to crafting to allow modular weapons to work as intended. 2022-05-16 15:10:48 -04:00
IsseW
bd53d0b354 fix wrong spelling 2022-05-16 00:06:57 +02:00
IsseW
fb7aa07b01 site command completion 2022-05-15 23:57:21 +02:00
Cheuk Yin Ng
0962d3d67e Add chat window opacity value alongside slider 2022-05-15 08:30:30 -07:00
holychowders
be0e322219 Remove "(Items)" from stealth stat descriptions. 2022-05-14 09:34:57 -05:00
holychowders
63f829be66 Add icon to stealth stat in Bag UI. 
- Thanks to Toaster for making the icon.
 2022-05-12 20:28:23 -05:00
holychowders
ff905fab95 Add stealth stat to Bag UI. NOTE: Needs icon. 2022-05-12 20:26:43 -05:00
Joshua Barretto
e02f8aee65 Merge branch 'zesterer/lod-objects' into 'master' 
LoD Objects (inc. Trees)

See merge request veloren/veloren!3367
 2022-05-11 14:56:12 +00:00
Joshua Barretto
01e1cb34b0 Fixed minor LoD issues 2022-05-11 15:00:44 +01:00
Joshua Barretto
9ac84c0a3a Improved LoD models 2022-05-11 12:20:42 +01:00
Joshua Barretto
5e1f16fb7a Better tree colours 2022-05-11 00:15:05 +01:00
Joshua Barretto
907ba3dcbc Added giant trees to LoD 2022-05-10 20:30:48 +01:00
Joshua Barretto
d4fd9d2d0e Added LoD houses 2022-05-10 19:19:46 +01:00
Joshua Barretto
7382aab13a Upped default LoD distance 2022-05-10 17:12:12 +01:00
Joshua Barretto
c7e51a6c59 Added frustum culling for LoD objects 2022-05-10 16:21:14 +01:00
Joshua Barretto
19d19df63c Flush LoD distance on login 2022-05-10 15:43:53 +01:00
Joshua Barretto
06300bc75f Updated changelog 2022-05-10 12:56:24 +01:00
Joshua Barretto
f35c98d1a1 Added LoD distance setting 2022-05-10 12:40:06 +01:00
Joshua Barretto
2d7aa1aaa3 Added no terrain pop experimental shader 2022-05-10 12:40:06 +01:00
Joshua Barretto
596ae73117 Added NoLodVoxels option 2022-05-10 12:40:06 +01:00
Joshua Barretto
2df01385d2 Voxelise trees 2022-05-10 12:38:37 +01:00
Joshua Barretto
1db7cc7fde LoD trees in snow are white 2022-05-10 12:38:36 +01:00
Joshua Barretto
cf346d05c1 Different kinds of tree 2022-05-10 12:38:36 +01:00
Joshua Barretto
ac0e7a7724 Use dedicated fragment shader 2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687 Initial implementation of LoD trees 2022-05-10 12:38:36 +01:00
holychowders
1ebbf335e1 Simplify stealth logic. Remove max item stealth upper limit and restore close to original curve. 2022-05-06 19:25:03 -05:00
holychowders
dc9dbc30b4 - Adjust Stats Diary UI to show stealth as a percentage from armor items. 
- `(Max)` is also shown when stealth from items is maxed out (currently
  30%).

Notes:
- FIXME: Someone more familiar with the different armor types may want to adjust their stealths.
  - In addition, the current max stealth sum from armor is `0.3`, beyond which no stealth effect is caused.
 2022-05-06 13:15:46 -05:00
Marcel Märtens
697673bcca update toolchain to nightly-2022-04-25 2022-05-03 15:22:28 +02:00
Marcel Märtens
fa49248c31 switch to upstream vek again 2022-04-28 09:10:55 +02:00
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
Marcel
967d151312 Merge branch 'aerialfiddle/be_BY' into 'master' 
Fixed an error where '{amount} Exp' floater did not use existing localizations

See merge request veloren/veloren!3332
 2022-04-19 17:02:19 +00:00
Anton Katsuba
d37db03270 Fixed an error where '{amount} Exp' floater was displayed only in English despite localizations being available 2022-04-19 18:28:15 +03:00
aflying pumpkin
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
Leonid Toshchev
860af759a4 # Fix 994: fix panic when hotloading figure manifests 2022-04-14 15:53:39 +00:00
Marcel Märtens
64b9602760 update further dependencies, including strum and get rid of old strum_macro 2022-04-04 16:06:47 +02:00
Marcel Märtens
affdf3131f update a bunch of dependencies, including clap3 2022-04-04 11:43:29 +02:00
jh0l
585bcda729 fix: 🐛 resolve issue where client spams TradeAction updates based on out of sync PendingTrade values 2022-03-27 20:25:22 +02:00
jh0l
32d4ddd4fd style: 🎨 remove newline 2022-03-27 20:25:20 +02:00
Jack hollis-london
aeae94d31b small refactor per code review 2022-03-27 20:25:19 +02:00
jh0l
403a523ec7 refactor: ♻️ move voxygen hud update definitions from common/trade to voxygen/hud & trade 2022-03-27 20:24:23 +02:00
jh0l
de70ce61d8 feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing 2022-03-27 20:24:21 +02:00
jh0l
991cfcaa47 feat: 🌐 add i18n for trade amount input placeholder 2022-03-27 20:24:20 +02:00
jh0l
6f22f31376 feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing 2022-03-27 20:24:18 +02:00
Andrzej Drabarek
fa5555a348 Fixed Tutorial HUD being covered up by other HUD elements. 2022-03-20 19:05:10 +01:00
Mehmet-dev
903e216d32 fixing blood particles on bodies not supposed to bleed from gameplay perspective 2022-03-20 15:45:50 +00:00
Marcel
aa244b23c4 Merge branch 'Melonai/apply_mount_offset_to_weapon_trails' into 'master' 
Apply mount transform position to weapon trails

Closes #1489

See merge request veloren/veloren!3279
 2022-03-15 21:24:49 +00:00
Imbris
1ff8fffa1d Merge branch 'olexorus/2021_cleanup' into 'master' 
Simplifications made possible by the 2021 Edition

Closes #1447

See merge request veloren/veloren!3277
 2022-03-15 21:05:53 +00:00
Mel
0ba3a806c0 Apply mount transform position to weapon trails 2022-03-15 21:47:17 +01:00
DaforLynx
e936a27d40 Small sound fixes 2022-03-15 16:23:10 +00:00
Olexorus
2212c3d70c Remove borrow-checker appeasing code that's no longer necessary in Rust 2021 2022-03-15 16:49:03 +01:00
DaforLynx
7b6f424bb0 Loud rivers 2022-03-13 07:47:23 +00:00
DaforLynx
123fee2707 Fix swim sfx, fix glider sfx, add glide sfx 2022-03-13 05:44:07 +00:00
Marcel
d05cb99007 Merge branch 'unvariant/trading_fix' into 'master' 
prevent glider and sneak from triggering during trade

See merge request veloren/veloren!3264
 2022-03-08 10:25:16 +00:00
ninefox
115b2875b3 prevent glider and sneak from triggering during trade 2022-03-07 20:28:38 -08:00
Isidor Nielsen
a5ab36e6b5 Map marker fixes 2022-03-07 12:16:04 +00:00
Sam
89bf529a5e Addressed review comments 2022-03-03 01:12:40 -05:00
Sam
f5e0cb0045 Addressed review comments 2022-03-03 01:11:18 -05:00
Sam
0a0fffd5ed Addressed review comments 2022-03-03 01:11:17 -05:00
Sam
5a60562eee Addressed review comments 2022-03-03 01:11:16 -05:00
Sam
ce70c512e2 Arrow trails 2022-03-03 01:11:15 -05:00
Sam
48c97cd829 Glider trails 2022-03-03 01:11:13 -05:00
Sam
eacd43be16 Moved weapon offset functions up a level. Should allow gliders and arrows to be handled better. 2022-03-03 01:11:12 -05:00
jshipsey
6ba8af5434 anim additions 2022-03-03 01:11:11 -05:00
Sam
f3c5c2b5e3 Pointy trails 2022-03-03 01:11:10 -05:00
Sam
b3a19ebc00 Weapon trails now works with dual wielding 2022-03-03 01:11:08 -05:00
Sam
a967daa2f5 Trails now controlled and enabled from animation files. 2022-03-03 01:11:07 -05:00
Sam
fc1a9f3c61 Trail thinning is now smooth 2022-03-03 01:11:06 -05:00
Sam
87434c472c Trails shrinks over time 2022-03-03 01:11:05 -05:00
Sam
ab4c5dac87 Reset vertices for trails in trail manager. 2022-03-03 01:11:04 -05:00
Sam
bee16001ed Don't upload weapon trails to GPUs for entities that have only zero quds. 2022-03-03 01:11:03 -05:00
Sam
cfbb3a5bca Changed to a single dynamic model 2022-03-03 01:11:02 -05:00
Monty Marz
82def16969 visuals 2022-03-03 01:11:00 -05:00
Sam
c6dc96b795 Settings button to turn off weapon trails. 2022-03-03 01:10:59 -05:00
Sam
f4abe4f275 More tweaks 2022-03-03 01:10:58 -05:00
Sam
1f2ede656e Fixed tests 2022-03-03 01:10:57 -05:00
Sam
b558331b32 Finishing touches 2022-03-03 01:10:55 -05:00
Sam
d23dd6c9e9 Fixed a few errors 2022-03-03 01:10:54 -05:00
Sam
5018a9f476 Game now runs, still doesn't work 2022-03-03 01:10:53 -05:00
Sam
33419c7b4c Trails are now hackily created. 2022-03-03 01:10:51 -05:00
Sam
05f53a5316 Changed to one dynamic model per entity. 2022-03-03 01:10:50 -05:00
Sam
d9028ec978 Dynamic model now used for trail. 2022-03-03 01:10:49 -05:00
Sam
0794f980fe Mostly snaked through another rendering pipeline 2022-03-03 01:10:47 -05:00
Christof Petig
f347b9de11 Diversify price calculation for items by using multiple categories per item. 2022-03-03 02:32:34 +00:00
ubruntu
d18242a1df Fix interactable HUD 2022-02-27 21:50:07 +00:00
Imbris
8742a37e0f Changes based on review. Fix tests. 2022-02-27 14:43:08 -05:00
Imbris
e6c2239744 Fix typo. cargo fmt. 2022-02-27 13:47:13 -05:00
Imbris
e52159f638 Remove original character from game world when possessing to make persistence more robust. 2022-02-27 13:47:13 -05:00
Imbris
10803a9735 Stop using Character presence kind when possessing so that persistence doesn't get messed up. 2022-02-27 13:47:12 -05:00
Karl Werf
4dae579aca Minimap draw order fix 
Minimap location marker and player indicator are no longer drawn on top of the main map if they overlap.
Minimap location marker is no longer a button.
 2022-02-27 15:41:12 +01:00
Imbris
4aa89fd6cc Merge branch 'unvariant/center_item_drops' into 'master' 
Center item drops

See merge request veloren/veloren!3232
 2022-02-27 02:07:30 +00:00
ninefox
329051c6df removed extra fields from item_drop_manifest.ron 
added TODO about applying non-random rotations in load.rs
 2022-02-26 10:13:04 -08:00
Imbris
08f67a335f Add experimental shader option that lowers glow strength for lights near the camera 2022-02-26 00:26:42 -05:00
ninefox
5aa98b7b3e Applied review suggestions 2022-02-23 18:37:04 -08:00
ninefox
61913402a2 add code to center item drops 
reduce size of coins
 2022-02-23 17:16:10 -08:00
Marcel
2a9f75340a Merge branch 'spanish_translation' into 'master' 
apply changes from MR!2904

See merge request veloren/veloren!3224
 2022-02-20 16:26:24 +00:00
Marcel
df7cd2da1a Merge branch 'isse/shared-waypoints' into 'master' 
Shared and persistent waypoints

See merge request veloren/veloren!3162
 2022-02-20 10:10:18 +00:00
Isidor Nielsen
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
Marcel
6a9924d6ca Merge branch 'imbris/small-fixes' into 'master' 
Small bits of code cleanup

See merge request veloren/veloren!3222
 2022-02-20 09:41:21 +00:00
Marcel Märtens
e2648f6733 apply changes from MR!2904 2022-02-20 10:18:24 +01:00
Imbris
d8996a9b94 Remove unwrap in handling of the DeleteServer message in the main menu ui 2022-02-19 19:37:53 -05:00
Imbris
adec5905bd Properly wait to request buffer mapping until after the command to copy the screenshot texture to the buffer has been submitted. 2022-02-19 19:05:04 -05:00
Marcel Märtens
802b9e7914 Change the version number to 0.12 2022-02-18 22:36:53 +01:00
Treeco
fdd7237dfc Removed dead settings button from main menu 2022-02-18 16:11:30 +00:00
Monty Marz
9ca1693ef8 New login-screen bg image 2022-02-17 16:08:37 +00:00
Imbris
bdb10c4e14 Merge branch 'isse/minor-ux-improvements' into 'master' 
Minor inventory ux improvements

Closes #1436

See merge request veloren/veloren!3157
 2022-02-16 21:48:03 +00:00
Isidor Nielsen
67f2d05d3c Minor inventory ux improvements 2022-02-16 21:48:03 +00:00
ShouvikGhosh2048
d72f43190b Fixes #1452 - Prevents empty trades 2022-02-16 21:41:26 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master' 
Gnarlings

See merge request veloren/veloren!3194
 2022-02-15 00:22:37 +00:00
Sam
f30e879cf5 Clippy fixes 2022-02-14 17:23:15 -05:00
Monty Marz
900fff7ba9 small UI fixes, new haste buff icon 2022-02-14 19:24:59 +01:00
Sam
3373985a5f Comments 2022-02-13 23:35:18 -05:00
Sam
6dafacaa24 Addressed review comments 2022-02-13 21:49:46 -05:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
Imbris
ddcee8448b Merge branch 'persist_debug_checkbox' into 'master' 
Persist interface debug checkbox across sessions

See merge request veloren/veloren!3147
 2022-02-13 19:43:51 +00:00
Monty Marz
c7ce2b773c new icons 2022-02-12 22:46:34 +01:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
Sam
377906dfa0 Ground shockwave particle tweaks. 2022-02-10 22:40:26 -05:00
Sam
86a00e75bb Tweaked fire particles 2022-02-10 14:58:37 -05:00
Sam
bf7e84c6ae Initial particle work 2022-02-10 14:58:37 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
jshipsey
3a35dcc77f brick texture colors 2022-02-10 14:58:34 -05:00
jshipsey
0c788997a4 anims 2022-02-10 14:58:34 -05:00
Sam
fcb0f8d8f0 Wood golem attacks and ai 2022-02-10 14:58:32 -05:00
Sam
e1f164d099 Initial AI for gnarling logger/mugger. 2022-02-10 14:58:27 -05:00
ninefox
2e902c1c5c swapped show.debug for interface.toggle_debug 2022-02-09 18:31:46 -08:00
jshipsey
72f2b2eee8 clippy 2022-02-09 19:35:05 -05:00
jshipsey
7ae85aef50 tweaks 2022-02-09 19:34:24 -05:00
jshipsey
6d34a6b544 wallrunning 2022-02-09 19:34:23 -05:00
jshipsey
6f8cadc847 wall contact, run anim tweaks 2022-02-09 19:34:22 -05:00
Joshua Barretto
b2d6b06e2e Merge branch 'zesterer/bare-minimum' into 'master' 
Added BareMinimum shader effect

See merge request veloren/veloren!3188
 2022-02-09 23:29:17 +00:00
Joshua Barretto
8888190eb4 Added BareMinimum shader effect 2022-02-09 12:56:21 +00:00
phoenix13032005
7a1f0d9fa1 Balance update 
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
 2022-02-09 12:13:42 +02:00
Imbris
18f6077321 Merge branch 'imbris/srgb-dither' into 'master' 
Dither in nonlinear srgb space and dithering related experimental shader options

See merge request veloren/veloren!3160
 2022-02-01 21:24:50 +00:00
Imbris
2325ac3d78 Use ori as fallback for look_dir so that other entities will turn properly when shooting (controller component is not synced) 2022-01-30 23:30:34 -05:00
Marcel Märtens
201a5ac2c7 stricten some rules and fix some clippy warnings 2022-01-30 20:16:21 +01:00
Avi Weinstock
f3f08936d8 Decrease too-many-arguments-threshold and type-complexity-threshold. 2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}. 2022-01-30 20:16:20 +01:00
Imbris
21cad12272 Merge branch 'fix-ghost-item' into 'master' 
Fix ghost item when trade gets declined

Closes #1429

See merge request veloren/veloren!3117
 2022-01-30 17:31:15 +00:00
Imbris
89edd18787 Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options 2022-01-28 22:55:59 -05:00
juliancoffee
fba89517de Move Veloren to 2021 edition 2022-01-26 16:46:40 +02:00
juliancoffee
6a0458ddf1 Move voxygen to 2021 edition 2022-01-26 15:47:39 +02:00
juliancoffee
9edd526279 Move voxygen-i18n to 2021 edition 2022-01-26 15:13:05 +02:00
Marcel
0ebff57a59 Merge branch 'Martin/remove-server-from-list' into 'master' 
Feature: Delete button in the servers menu

See merge request veloren/veloren!3144
 2022-01-26 10:20:15 +00:00
ninefox
e6ced0577e Persist interface debug checkbox 2022-01-25 22:47:26 -08:00
Dominik Broński
ca7b048184 Merge branch 'SeaCrocodile' into 'master' 
Sea crocodile

See merge request veloren/veloren!3146
 2022-01-26 01:26:38 +00:00
Martin
700f709664 added delete button in the settings window which deletes a server from the list 2022-01-25 19:48:58 +02:00
Martin
a86ed49293 added message and event for deleting a server from the list 2022-01-25 19:48:19 +02:00
Imbris
432d78a232 Merge branch 'imbris/screenshot-format' into 'master' 
Support multiple texture formats for screenshots

See merge request veloren/veloren!3134
 2022-01-25 14:45:54 +00:00
Imbris
2bada7f02a Don't send egui events when it is hidden and as a result these events are also never captured by egui. This fixes issues with the mouse clicks being captured if the mouse was hovered over the egui UI when it was toggled off. 2022-01-25 01:23:46 -05:00
Imbris
c320604a36 Support multiple texture formats for screenshots 2022-01-25 00:36:08 -05:00
InfRandomness
df6a0002e9 Move alpha values calculation to CPU 2022-01-24 19:24:51 +00:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
Justin Shipsey
05d5bca72d Merge branch 'slipped/roll' into 'master' 
hold weapon while rolling

See merge request veloren/veloren!3135
 2022-01-24 09:56:00 +00:00
jshipsey
067f06561f hold weapon while rolling 2022-01-24 03:55:00 -05:00
Imbris
57781eac27 Only toggle egui via F7 instead of needing to also have debug toggle on with F3 2022-01-24 01:40:55 -05:00
Imbris
086b4bece8 Merge branch 'kalikatz/tweak_to_chat_scroll_issue' into 'master' 
Kalikatz/tweak to chat scroll issue

See merge request veloren/veloren!2962
 2022-01-24 06:14:08 +00:00
Imbris
fc3da4bfce Merge branch 'imbris/sobel' into 'master' 
Add experimental sobel filter

See merge request veloren/veloren!3113
 2022-01-24 02:42:54 +00:00
Imbris
7e5a3efd02 Add egui window to toggle experimental shaders. 2022-01-23 21:14:41 -05:00
Joshua Barretto
d18174e0d1 Revert "Merge branch 'infrandomness/remove_alpha' into 'master'" 
This reverts merge request !3128
 2022-01-24 00:52:03 +00:00
Imbris
6cfadc4f65 Add sobel filter as experimental shader option 2022-01-23 16:32:26 -05:00
Joshua Barretto
470353e08c Fix for translucency blocking clouds 2022-01-23 16:32:26 -05:00
Joshua Barretto
38832fadd3 Improved underwater lighting on low shader settings 2022-01-23 16:32:26 -05:00
Joshua Barretto
e6332c1cb5 Significantly improved underwater shaders 2022-01-23 16:32:25 -05:00
Dr. Dystopia
9306dc816f Fix warnings 2022-01-23 16:32:25 -05:00
ubruntu
57d9283afb Show HUD for campfires 2022-01-23 16:32:25 -05:00
Joshua Barretto
bdb0fc9c16 Merge branch 'zesterer/underwater' into 'master' 
Underwater shaders

See merge request veloren/veloren!3127
 2022-01-23 20:36:47 +00:00
Forest Anderson
d3aa224f15 Merge branch 'tygyh/Fix-warnings' into 'master' 
Fix warnings

See merge request veloren/veloren!3051
 2022-01-23 19:25:35 +00:00
Joshua Barretto
8504a8ab21 Merge branch 'ubruntu/campfire-hud' into 'master' 
Show HUD for campfires

See merge request veloren/veloren!3097
 2022-01-23 19:25:11 +00:00
ubruntu
ca2a81c20f Show HUD for campfires 2022-01-23 19:25:11 +00:00
Forest Anderson
7c99f6eb5e Merge branch 'unvariant/affix_remap_button' into 'master' 
Affixed remap/clear button to top of control settings window

See merge request veloren/veloren!3119
 2022-01-23 18:40:43 +00:00
Dr. Dystopia
bb48267827 Fix warnings 2022-01-23 19:03:47 +01:00
InfRandomness
69c3480fce Move alpha values calculation 2022-01-23 17:16:22 +00:00
Joshua Barretto
8a684973b4 Merge branch 'zesterer/tiny-fixes' into 'master' 
Addressing criticisms

See merge request veloren/veloren!3121
 2022-01-22 16:44:01 +00:00
Joshua Barretto
b8df17080d Merge branch 'infrandomness/waypoint_binding_customization' into 'master' 
Add waypoint binding customization code

See merge request veloren/veloren!3122
 2022-01-21 18:05:41 +00:00
InfRandomness
b33fda1e0c Add waypoint binding customization code 2022-01-21 18:05:41 +00:00
Joshua Barretto
c0e3f0abef Merge branch 'ubruntu/chest-sprite-names' into 'master' 
Fix chest display names

See merge request veloren/veloren!3125
 2022-01-21 18:05:39 +00:00
ubruntu
1d0c861e19 Fix chest display names 2022-01-21 18:05:39 +00:00
Joshua Barretto
31b9cd0565 Fix for translucency blocking clouds 2022-01-21 17:29:59 +00:00
Joshua Barretto
3b347a2aa3 Improved underwater lighting on low shader settings 2022-01-21 13:35:40 +00:00
Samuel Keiffer
a00ac11e25 Merge branch 'sam/fix-possess' into 'master' 
Fix possession bug

See merge request veloren/veloren!3123
 2022-01-21 07:40:23 +00:00
Joshua Barretto
5b606f0d50 Significantly improved underwater shaders 2022-01-21 00:42:20 +00:00
Sam
fe1db1e9e0 Can move around, so character state system runs 
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
 2022-01-20 15:26:35 -05:00
Joshua Barretto
4f181c936d Merge branch 'name_areas_based_on_biome' into 'master' 
name_areas_based_on_biome

See merge request veloren/veloren!3115
 2022-01-20 19:50:57 +00:00
Joshua Barretto
5a7cd39625 Added point glow slider 2022-01-20 13:40:11 +00:00
Joshua Barretto
89cd58b1ac Don't allow interaction with mounted entity 2022-01-20 11:25:53 +00:00