Commit Graph

11356 Commits

Author SHA1 Message Date
Anton Katsuba
cca14ff4a3 Minor orthography fixes 2022-05-04 16:54:21 +03: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
Anton Katsuba
c3d4f9972d be_BY minor orthography correction 2022-04-18 22:51:33 +03:00
Anton Katsuba
9a8f405ca8 Added Belarusian translation, 100% complete 2022-04-18 00:04:54 +03:00
Marcel
8df86454b3 Merge branch 'kretka/russian-translate' into 'master'
Update ru_RU

Closes #1 and #2

See merge request veloren/veloren!3324
2022-04-10 21:05:23 +00:00
Влад Куцепалов
51e50abb4c Update ru_RU 2022-04-10 21:05:23 +00:00
Samuel Keiffer
ffe12bfdeb Merge branch 'juliancoffee/loadout_config_update' into 'master'
Add LoadoutSpecNew with new loadout config

See merge request veloren/veloren!3234
2022-04-10 17:40:11 +00:00
juliancoffee
1b18629616 Execute asset migration 2022-04-08 19:17:01 +03:00
juliancoffee
f875c0b5d4 Adress review 2022-04-08 16:37:06 +03:00
juliancoffee
8a1d665b0d Box inlined LoadoutSpec 2022-04-07 18:44:16 +03:00
juliancoffee
11bf16e3d7 Make ItemSpec and Hands untagged 2022-04-07 18:44:16 +03:00
juliancoffee
13324700ba Post-cleaning 2022-04-07 18:44:16 +03:00
juliancoffee
faeac0eef3 Fully implement tests for new EntityConfig 2022-04-07 18:44:15 +03:00
juliancoffee
dd02e8ae6a Add loadout spec examples 2022-04-07 18:44:15 +03:00
juliancoffee
cfba7bfc65 Add validation functions to LoadoutSpec 2022-04-07 18:44:15 +03:00
juliancoffee
7cd5a694b2 Dummy implementation of LoadoutSpec tests 2022-04-07 18:44:15 +03:00
juliancoffee
09d395f528 Remove temporary test files from git repo 2022-04-07 18:44:15 +03:00
juliancoffee
a4908cf5ae Implement migration for EntityConfig 2022-04-07 18:44:15 +03:00
juliancoffee
15431e7f7a Dummy implementation for EntityConfig migration 2022-04-07 18:44:15 +03:00
juliancoffee
357b953e3b Implement new InventorySpec for EntityConfig
* Add new InventorySpec which uses Inline loadout spec
* Disable all tests!
2022-04-07 18:44:15 +03:00
juliancoffee
77f8d6da6f Remove old loadout_builder::LoadoutSpec 2022-04-07 18:44:15 +03:00
juliancoffee
f791dace7f Avoid writing None fields in LoadoutSpecNew
* use serde(skip_serializing_if = "Option::is_none")
2022-04-07 18:44:15 +03:00
juliancoffee
48c7e29db2 Add comment migrations to asset_migrate 2022-04-07 18:44:15 +03:00
juliancoffee
b81904efd1 Implement migration script for LoadoutSpec 2022-04-07 18:44:15 +03:00
juliancoffee
3f7bfff8d7 Implement all needed features
+ Multiple/Random inheritance for loadout configs
+ Using ItemSpecNew in Hands
+ Rename Hands::Specific to Hands::InHands to represent non-random
  combination
2022-04-07 18:44:14 +03:00
juliancoffee
5e07875be9 Add LoadoutSpecNew with new loadout config
Changes from old config:
* Structure instead of HashMap which allows us have multiple types for
  fields.
* Using error propagating instead of panic, which opens possibility for
  better error messages.
* Implemented inheritance.
* New Hands type for more practical way of declaring weapons/tools.
2022-04-07 18:44:14 +03:00
Marcel
d9825d1d38 Merge branch 'translatede' into 'master'
Add German translation to .desktop and metainfo

See merge request veloren/veloren!3320
2022-04-05 22:14:00 +00:00
JakobDev
fbabbbb959 Add German translation to .desktop and metainfo 2022-04-05 08:11:09 +00:00
Samuel Keiffer
fc0ecdbc22 Merge branch 'james/fix-agent-idle' into 'master'
Fix #1516 Add else branch to allow for agent idling when no sound events

Closes #1516

See merge request veloren/veloren!3319
2022-04-05 03:40:26 +00:00
James Melkonian
b590bc50d7 Fix #1516 Add else branch to allow for agent idling when no sound events 2022-04-05 03:40:26 +00:00
Marcel
50fd55daef Merge branch 'tormod-personalities' into 'master'
Give NPCs random Big Five personalities.

See merge request veloren/veloren!3280
2022-04-04 19:03:05 +00:00
Marcel
2495e07646 Merge branch 'xMAC94x/update_deps2' into 'master'
update further dependencies, including strum and get rid of old strum_macro

See merge request veloren/veloren!3318
2022-04-04 19:03:03 +00:00
Tormod G. Hellen
cb88648cca Give NPCs random Big Five personalities. 2022-04-04 20:17:50 +02: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
73d6d96499 Merge branch 'xMAC94x/update_deps' into 'master'
xMAC94x/update deps

See merge request veloren/veloren!3311
2022-04-04 10:37:41 +00:00
Marcel Märtens
affdf3131f update a bunch of dependencies, including clap3 2022-04-04 11:43:29 +02:00
Marcel Märtens
a0a0e36246 update network dependencies 2022-04-02 15:44:07 +02:00
Isse
5ef75552d0 Merge branch 'floppy-CliffTown' into 'master'
CliffTowns

See merge request veloren/veloren!3285
2022-03-29 12:52:24 +00:00
flo
3d24b1d635 CliffTowns 2022-03-29 12:52:08 +00:00
Samuel Keiffer
a7e8b22d1d Merge branch 'james/fix-harvester-hole' into 'master'
Adjust harvester boss arena offset

See merge request veloren/veloren!3289
2022-03-28 04:52:03 +00:00
James Melkonian
5b801dc44d Adjust harvester boss arena offset 2022-03-27 20:41:03 -07:00
Marcel
8571c6c760 Merge branch 'holychowders/fix_deadwood_attack' into 'master'
Fix deadwood not attacking if target is at a different elevation than deadwood.

See merge request veloren/veloren!3301
2022-03-27 20:02:38 +00:00
holychowders
39d5a73c10 Fix deadwood not attacking if target is at a different elevation than deadwood. 2022-03-27 20:02:38 +00:00
Marcel
f96b803f63 Merge branch 'jh0l/trading_amount_input' into 'master'
feat:  an input box in the trade window so that users can set an exact amount

See merge request veloren/veloren!3261
2022-03-27 18:49:13 +00: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
Jack hollis-london
8194c19647 Update CHANGELOG.md 2022-03-27 20:25:16 +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