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
11,394 Commits 151 Branches 18 Tags 2.1 GiB
914b44c714
Commit Graph

11394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
holychowders
914b44c714 Fix villagers seeing cultists and familiar enemies through objects. 2022-05-01 15:06:43 +00:00
Marcel
a22f035638 Merge branch 'xMAC94x/cleanup_old' into 'master' 
remove unused file

See merge request veloren/veloren!3346
 2022-04-28 11:09:11 +00:00
Marcel
3163f593ce Merge branch 'xMAC94x/fix_ci' into 'master' 
accidently checked for SCHEDULE_CADENCE to be empty

See merge request veloren/veloren!3345
 2022-04-28 10:25:51 +00:00
Marcel Märtens
d70c8dd160 remove unused file 2022-04-28 12:23:55 +02:00
Marcel Märtens
6aa4d664fc accidently checked for SCHEDULE_CADENCE to be empty 2022-04-28 12:03:58 +02:00
Marcel
a45791dda5 Merge branch 'giant-tree-entities' into 'master' 
Site2 giant tree entity spawning

See merge request veloren/veloren!3344
 2022-04-27 10:53:08 +00:00
Isse
3027597352 Site2 giant tree entity spawning 2022-04-27 10:53:08 +00:00
Marcel
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
Clary Chevry
f78245615e FR Translation up to date 2022-04-26 17:29:09 +00:00
Marcel
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
Marcel Märtens
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
Marcel
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
Marcel Märtens
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
Marcel
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
Marcel
083964e1ad Merge branch 'xMAC94x/fix_ci' into 'master' 
fix typo

See merge request veloren/veloren!3337
 2022-04-24 16:28:46 +00:00
Marcel Märtens
ddb90b9f5a skip artifact downloading in CI page and tag jobs 2022-04-24 18:26:21 +02:00
Marcel Märtens
c55cbb16e1 fix typo 2022-04-24 18:21:36 +02:00
Marcel
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
Marcel
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
Marcel Märtens
0c50d6fe24 include gittag into yaml 2022-04-24 10:42:14 +02:00
Marcel Märtens
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
Marcel Märtens
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
Christof Petig
40cf44d7b1 Enforce a minimum price for goods 2022-04-23 22:11:29 +02:00
Samuel Keiffer
c6066d7f3f Merge branch 'balance_tweaks' into 'master' 
Balance tweaks

See merge request veloren/veloren!3257
 2022-04-23 14:54:01 +00: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
Marcel
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
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
Samuel Keiffer
4fb2319651 Merge branch 'aflyingpumpkin/better_lions' into 'master' 
Added Lionesses

See merge request veloren/veloren!3211
 2022-04-16 16:57:59 +00:00
aflying pumpkin
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
Samuel Keiffer
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
Plright
cffa980f24 Fixed being able to sneak on mount 2022-04-16 16:56:47 +00:00
Samuel Keiffer
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
Marcel
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
Leonid Toshchev
860af759a4 # Fix 994: fix panic when hotloading figure manifests 2022-04-14 15:53:39 +00:00
Marcel
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
Vlad
f91cdfbf9f ru_RU update 2022-04-14 06:26:32 +00:00
Imbris
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
holychowders
cc409fd537 Extract some retargeting logic. 2022-04-11 11:54:09 -05: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