|
|
2e7f31dbe5
|
Merge branch 'Ban/FR-Translation' into 'master'
FR Translation up to date
See merge request veloren/veloren!3339
|
2022-04-26 17:29:09 +00:00 |
|
|
|
f78245615e
|
FR Translation up to date
|
2022-04-26 17:29:09 +00:00 |
|
|
|
ff34891665
|
Merge branch 'xMAC94x/fixed_ci3' into 'master'
kaniko seems to have a different shell that doesnt support local command, just use export then
See merge request veloren/veloren!3341
|
2022-04-25 06:21:25 +00:00 |
|
|
|
dba817ba57
|
kaniko seems to have a different shell that doesnt support local command, just use export then
|
2022-04-25 08:10:35 +02:00 |
|
|
|
b3fd521d00
|
Merge branch 'xMAC94x/fixed_ci2' into 'master'
Seems like before_script in publish was overwriting cargo on pages job, so i...
See merge request veloren/veloren!3340
|
2022-04-24 18:16:22 +00:00 |
|
|
|
0941dfffae
|
Seems like before_script in publish was overwriting cargo on pages job, so i just move it into the script itself
|
2022-04-24 19:48:27 +02:00 |
|
|
|
731fd1021d
|
Merge branch 'xMAC94x/no_deps' into 'master'
skip artifact downloading in CI page and tag jobs
See merge request veloren/veloren!3338
|
2022-04-24 17:45:24 +00:00 |
|
|
|
083964e1ad
|
Merge branch 'xMAC94x/fix_ci' into 'master'
fix typo
See merge request veloren/veloren!3337
|
2022-04-24 16:28:46 +00:00 |
|
|
|
ddb90b9f5a
|
skip artifact downloading in CI page and tag jobs
|
2022-04-24 18:26:21 +02:00 |
|
|
|
c55cbb16e1
|
fix typo
|
2022-04-24 18:21:36 +02:00 |
|
|
|
2ddd1cc0a7
|
execute with local tracing environment
sadly the level passed is ignored, and it warns about an invalid filter directive
but RUST_LOG environment variables work as expected
|
2022-04-24 17:26:16 +02:00 |
|
|
|
ab985b54ab
|
initialize ERROR not INFO
|
2022-04-24 17:26:16 +02:00 |
|
|
|
5f5ebeecfe
|
ignore expensive tests without much added value
|
2022-04-24 17:26:16 +02:00 |
|
|
|
2f7c50281f
|
fix neighbor logic in test, fix clippy, fix rustfmt
|
2022-04-24 17:26:16 +02:00 |
|
|
|
8dfd6dc523
|
document more elements of economy
|
2022-04-24 17:26:16 +02:00 |
|
|
|
53ace17327
|
output trade to csv file
|
2022-04-24 17:26:16 +02:00 |
|
|
|
dc4b9dc19e
|
more readable and meaningful csv output
|
2022-04-24 17:26:16 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
