Commit Graph

4328 Commits

Author SHA1 Message Date
bb80bb256a fix(ci): create artifacts on merge to master 2020-05-27 07:12:54 +02:00
cba403df36 Closes #450: Send update chat message to all clients on successful alias change. 2020-05-26 22:00:47 -07:00
786665eac4 Merge branch 'sharp/deterministic-civsim' into 'master'
Make civsim and sites deterministic.

See merge request veloren/veloren!1009
2020-05-26 19:22:48 +00:00
e759d9a1c4 Merge branch 'treeco/settings-defaults' into 'master'
Change a bunch of settings defaults, fix sprite looting key

See merge request veloren/veloren!1013
2020-05-25 16:20:39 +00:00
c1af72d5b8 Update help.png 2020-05-25 15:45:05 +01:00
ec2ed4da2c Change a bunch of settings defaults, fix sprite looting key 2020-05-25 15:44:27 +01:00
2a83e91242 Waypoint notifications have a 10 second cooldown 2020-05-25 02:56:31 -04:00
b849f654c5 Merge branch 'songtronix/fix-ci' into 'master'
fix(ci): run pipeline for branches and tags

See merge request veloren/veloren!1015
2020-05-24 11:19:24 +00:00
26ee5e85cc fix(ci): run pipeline for branches and tags 2020-05-24 12:26:15 +02:00
9b0a652612 Merge branch 'songtronix/small-meta-fixes' into 'master'
Improve current CI situation

See merge request veloren/veloren!988
2020-05-23 09:02:13 +00:00
f71b317589 change(ci): adjust docs + fix release template 2020-05-23 10:02:39 +02:00
5b7f93e14e change(ci): trigger CI if changes were made to it 2020-05-22 18:13:58 +02:00
e8ba1b9767 fix(ci): make release branches work 2020-05-22 18:13:58 +02:00
69c65808dd add(ci): optional macos build 2020-05-22 18:13:58 +02:00
507086fac6 change(ci): centralise master/tag push check 2020-05-22 18:13:58 +02:00
ce7eced0b3 change(ci): centralise recompile check 2020-05-22 18:13:58 +02:00
93db252df6 change(ci): only run jobs if necessary 2020-05-22 18:13:57 +02:00
b6135f60ed change(ci): document and add retries + fmt 2020-05-22 18:13:57 +02:00
07d7d17182 change(ci): take advantage of auto cancel pending pipelines 2020-05-22 18:13:57 +02:00
7e58f80f11 change(ci): remove unused github workflow 2020-05-22 18:13:57 +02:00
b6de531e76 change(ci): split up stages into separate files 2020-05-22 18:13:57 +02:00
1fc613d137 remove code owners as it's not being used 2020-05-22 18:13:57 +02:00
556c69de88 add issue template for bugs 2020-05-22 18:13:57 +02:00
49d4141f0e Merge branch 'angelonfira/update-license' into 'master'
Update Veloren license year

See merge request veloren/veloren!1011
2020-05-22 13:02:03 +00:00
d9e0c774c2 Update Veloren license year 2020-05-22 08:05:10 -04:00
731fd4bcbc Merge branch 'treeco/no-seed-skip' into 'master'
Changed SEED_SKIP to 0

See merge request veloren/veloren!1010
2020-05-22 00:01:21 +00:00
4c41cc1050 Changed SEED_SKIP to 0 2020-05-21 21:59:59 +01:00
2f89b863e0 Merge branch 'treeco/new-map' into 'master'
Changed default map and seed, lowered site counts

See merge request veloren/veloren!992
2020-05-21 20:46:54 +00:00
34427373ef Make civsim and sites deterministic.
For anything in worldgen where you use a HashMap, *please* think
carefully about which hasher you are going to use!  This is
especially true if (for some reason) you are depending on hashmap
iteration order remaining stable for some aspect of worldgen.
2020-05-21 21:43:54 +02:00
cdee191dd6 Merge branch 'aeronic/forest-tune' into 'master'
Aeronic/forest tune

See merge request veloren/veloren!1008
2020-05-21 04:09:59 +00:00
9d7e0aad12 Aeronic/forest tune 2020-05-21 04:09:59 +00:00
012aebbfd6 Merge branch 'zesterer/small-fixes' into 'master'
Camera tweaks

See merge request veloren/veloren!1004
2020-05-19 17:35:43 +00:00
d44a2bc76e Merge branch 'angel/update-readme-banner' into 'master'
Updated the readme banner

See merge request veloren/veloren!1007
2020-05-19 15:21:42 +00:00
f09af7980f Fixed aiming for non-humanoids 2020-05-19 14:47:51 +01:00
5c3a08e450 Updated changelog and fmt 2020-05-19 14:41:08 +01:00
cc4dcf0670 Changed to new image 2020-05-19 09:31:10 -04:00
05e6df1b65 Added overhead aiming camera 2020-05-19 14:26:53 +01:00
db302b8525 Merge branch 'jbeich/veloren-freebsd' into 'master'
Enable system assets on more Unices

See merge request veloren/veloren!1005
2020-05-19 00:20:07 +00:00
2f47d09af4 Comment fixes and fmt 2020-05-19 00:35:58 +01:00
f1b166d15d Innumerable camera improvements 2020-05-18 23:40:28 +01:00
886cad9103 Enable system assets on more Unices 2020-05-18 15:53:50 +00:00
68e77f43f8 Made figure placement correct with warping 2020-05-18 15:15:58 +01:00
9e5c0ce601 Merge branch 'silentium/arms-and-armor' into 'master'
Added 2 sets of armour.

See merge request veloren/veloren!951
2020-05-17 19:03:00 +00:00
1673a25e8b Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
bb85dab281 Merge branch 'treeco/build-mode-fixes' into 'master'
Swapped block placement and destruction buttons

See merge request veloren/veloren!995
2020-05-16 23:48:25 +00:00
6c4e3eb00a Merge branch 'pfau/0.6-bg' into 'master'
Pfau/0.6 bg

See merge request veloren/veloren!996
2020-05-16 12:48:30 +00:00
ecb7963730 Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
4d3a7be150 Merge branch 'brazilianportugese' into 'add_pt_BR_translation'
# Conflicts:
#   assets/voxygen/i18n/pt_BR.ron
2020-05-15 23:35:03 +00:00
9693fd33ae Merge branch 'xMAC94x/release-numbers' into 'master'
xmac94x/release numbers

See merge request veloren/veloren!999
v0.6.0
2020-05-15 23:33:35 +00:00
855fe5da34 brazilianportugese 2020-05-15 19:19:14 -04:00