Commit Graph

11535 Commits

Author SHA1 Message Date
d897df4b78 output number of trade partners 2022-04-24 17:26:16 +02:00
eedfce45bc also output normal economic simulation 2022-04-24 17:26:16 +02:00
8e48d59539 also print situation in other econ test 2022-04-24 17:26:16 +02:00
b144ed42e3 display trade volume 2022-04-24 17:26:16 +02:00
57dafea9b4 group the first three settlements together (should enable them to survive by trade) 2022-04-24 17:26:16 +02:00
6f431a6fff rearrange and connect towns (shows planning weakness) 2022-04-24 17:26:16 +02:00
faf12118f0 remember which good a profession is missing for productivity 2022-04-24 17:26:16 +02:00
94bef521ce new test to check different resource situations 2022-04-24 17:26:15 +02:00
d409a67984 Merge branch 'xMAC94x/cleanup_ci' into 'master'
remove duplicate airshipper ci jobs. Introduce weekly build.

See merge request veloren/veloren!3286
2022-04-24 14:35:10 +00:00
c78253e8a6 Merge branch 'christof/minimum_price' into 'master'
Enforce a minimum price for goods

See merge request veloren/veloren!3335
2022-04-24 09:19:12 +00:00
0c50d6fe24 include gittag into yaml 2022-04-24 10:42:14 +02:00
618d4b2340 simply scripts alot, not the null check is necessray because gitlab ci regex with variables is weird and would contain errors otherwise.
limit pages to master run only, as we dont export scheduled pages
2022-04-24 10:41:35 +02:00
203fe7ad47 remove duplicate airshipper ci jobs. Introduce weekly build.
This requires the veloren schedule to contain variables and requires the airshipper server to handle those in the config
2022-04-24 07:39:57 +02:00
40cf44d7b1 Enforce a minimum price for goods 2022-04-23 22:11:29 +02:00
c6066d7f3f Merge branch 'balance_tweaks' into 'master'
Balance tweaks

See merge request veloren/veloren!3257
2022-04-23 14:54:01 +00:00
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
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
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
ce87cdfd7e Merge branch 'aerialfiddle/be_BY' into 'master'
Added Belarusian translation, 100% complete

See merge request veloren/veloren!3330
2022-04-19 10:16:08 +00:00
c3d4f9972d be_BY minor orthography correction 2022-04-18 22:51:33 +03:00
9a8f405ca8 Added Belarusian translation, 100% complete 2022-04-18 00:04:54 +03:00
4fb2319651 Merge branch 'aflyingpumpkin/better_lions' into 'master'
Added Lionesses

See merge request veloren/veloren!3211
2022-04-16 16:57:59 +00:00
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
7b1e7046df Merge branch 'fix_sneak_on_mount' into 'master'
Fixed being able to sneak on mount

See merge request veloren/veloren!3296
2022-04-16 16:56:47 +00:00
cffa980f24 Fixed being able to sneak on mount 2022-04-16 16:56:47 +00:00
40b4ba3982 Merge branch 'floppy-clifftown_sprite_fix' into 'master'
clifftown sprite fix

See merge request veloren/veloren!3329
2022-04-15 20:01:59 +00:00
flo
262a730cc6 clifftown sprite fix 2022-04-15 20:01:59 +00:00
86be66c605 Merge branch 'hr6134/994_fix_panic_when_hotloading' into 'master'
# Fix 994: fix panic when hotloading figure manifests

See merge request veloren/veloren!3328
2022-04-14 15:53:39 +00:00
860af759a4 # Fix 994: fix panic when hotloading figure manifests 2022-04-14 15:53:39 +00:00
a282e84607 Merge branch 'kretka/ru_RU/update' into 'master'
ru_RU update

See merge request veloren/veloren!3327
2022-04-14 06:26:32 +00:00
f91cdfbf9f ru_RU update 2022-04-14 06:26:32 +00:00
9d521988b3 Merge branch 'holychowders/refactor_hostility_logic' into 'master'
Extract some retargeting logic.

See merge request veloren/veloren!3321
2022-04-11 17:49:43 +00:00
cc409fd537 Extract some retargeting logic. 2022-04-11 11:54:09 -05:00
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
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
1b18629616 Execute asset migration 2022-04-08 19:17:01 +03:00
f875c0b5d4 Adress review 2022-04-08 16:37:06 +03:00
8a1d665b0d Box inlined LoadoutSpec 2022-04-07 18:44:16 +03:00
11bf16e3d7 Make ItemSpec and Hands untagged 2022-04-07 18:44:16 +03:00
13324700ba Post-cleaning 2022-04-07 18:44:16 +03:00
faeac0eef3 Fully implement tests for new EntityConfig 2022-04-07 18:44:15 +03:00
dd02e8ae6a Add loadout spec examples 2022-04-07 18:44:15 +03:00
cfba7bfc65 Add validation functions to LoadoutSpec 2022-04-07 18:44:15 +03:00
7cd5a694b2 Dummy implementation of LoadoutSpec tests 2022-04-07 18:44:15 +03:00
09d395f528 Remove temporary test files from git repo 2022-04-07 18:44:15 +03:00
a4908cf5ae Implement migration for EntityConfig 2022-04-07 18:44:15 +03:00
15431e7f7a Dummy implementation for EntityConfig migration 2022-04-07 18:44:15 +03:00
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
77f8d6da6f Remove old loadout_builder::LoadoutSpec 2022-04-07 18:44:15 +03:00