Commit Graph

3959 Commits

Author SHA1 Message Date
Songtronix
8c272ddec6 change(ci): adjust docs + fix release template 2020-05-23 10:02:39 +02:00
Songtronix
0e9569cb93 change(ci): trigger CI if changes were made to it 2020-05-22 18:13:58 +02:00
Songtronix
b226cbd023 fix(ci): make release branches work 2020-05-22 18:13:58 +02:00
Songtronix
b32946b150 add(ci): optional macos build 2020-05-22 18:13:58 +02:00
Songtronix
94eba0acb4 change(ci): centralise master/tag push check 2020-05-22 18:13:58 +02:00
Songtronix
589b8e62fb change(ci): centralise recompile check 2020-05-22 18:13:58 +02:00
Songtronix
d30ded9ded change(ci): only run jobs if necessary 2020-05-22 18:13:57 +02:00
Songtronix
e5fc212da4 change(ci): document and add retries + fmt 2020-05-22 18:13:57 +02:00
Songtronix
064ce8f24d change(ci): take advantage of auto cancel pending pipelines 2020-05-22 18:13:57 +02:00
Songtronix
b3260b4fba change(ci): remove unused github workflow 2020-05-22 18:13:57 +02:00
Songtronix
6630fce8aa change(ci): split up stages into separate files 2020-05-22 18:13:57 +02:00
Songtronix
d6efa6dc15 remove code owners as it's not being used 2020-05-22 18:13:57 +02:00
Songtronix
3951f24a06 add issue template for bugs 2020-05-22 18:13:57 +02:00
Forest Anderson
2fa9658580 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
Forest Anderson
dfbcc429b0 Update Veloren license year 2020-05-22 08:05:10 -04:00
Joshua Barretto
e17614ed57 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
Treeco
3d8a032cf7 Changed SEED_SKIP to 0 2020-05-21 21:59:59 +01:00
Joshua Yanovski
33900fd12b 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
Monty Marz
2d8ae23a32 Merge branch 'aeronic/forest-tune' into 'master'
Aeronic/forest tune

See merge request veloren/veloren!1008
2020-05-21 04:09:59 +00:00
Monty Marz
a6569bc2ae Aeronic/forest tune 2020-05-21 04:09:59 +00:00
Joshua Barretto
59f76e9fb5 Merge branch 'zesterer/small-fixes' into 'master'
Camera tweaks

See merge request veloren/veloren!1004
2020-05-19 17:35:43 +00:00
Forest Anderson
2c3c3d6162 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
Joshua Barretto
efee1428f9 Fixed aiming for non-humanoids 2020-05-19 14:47:51 +01:00
Joshua Barretto
12052d7abb Updated changelog and fmt 2020-05-19 14:41:08 +01:00
Forest Anderson
4896443aba Changed to new image 2020-05-19 09:31:10 -04:00
Joshua Barretto
bec4b500d8 Added overhead aiming camera 2020-05-19 14:26:53 +01:00
Forest Anderson
6ec101ecc2 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
Joshua Barretto
4ef429e6f5 Comment fixes and fmt 2020-05-19 00:35:58 +01:00
Joshua Barretto
833bd30602 Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Jan Beich
b3fa399a82 Enable system assets on more Unices 2020-05-18 15:53:50 +00:00
Joshua Barretto
7ae8881b32 Made figure placement correct with warping 2020-05-18 15:15:58 +01:00
Justin Shipsey
462461fc0a 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
Silentium
ee9b137d5f Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
Justin Shipsey
944bae8d5c 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
Monty Marz
cb44425e9d 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
Monty Marz
7a362810ee Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
Marcel
67a993d638 Merge branch 'xMAC94x/release-numbers' into 'master'
xmac94x/release numbers

See merge request veloren/veloren!999
2020-05-15 23:33:35 +00:00
Marcel Märtens
49c7e6568d fix Changelog.md links 2020-05-16 01:18:50 +02:00
Marcel Märtens
c55ec95bb7 swap main background for 0.6 background 2020-05-16 01:07:07 +02:00
Marcel Märtens
5e96162ad4 Change the version number to 0.6 2020-05-16 00:50:40 +02:00
Imbris
cb86ca4317 Merge branch 'imbris/stats-updater' into 'master'
Update stats in a separate thread

See merge request veloren/veloren!997
2020-05-15 21:52:40 +00:00
Imbris
353a97accf Wrap updates in transaction 2020-05-15 16:40:06 -04:00
Imbris
1059f20049 Update stats in a separate thread 2020-05-15 16:03:51 -04:00
Joshua Barretto
3b8dae468a Merge branch 'small-fixes' into 'master'
Dungeon Bosses

See merge request veloren/veloren!994
2020-05-15 19:07:11 +00:00
Joshua Barretto
db1065c478 Better spawn town 2020-05-15 19:26:09 +01:00
Joshua Barretto
42e7f99414 Fixed square staircases in dungeons 2020-05-15 18:34:05 +01:00
Joshua Barretto
072bac639f Fixed incorrect giant names 2020-05-15 18:33:34 +01:00
Treeco
355d9d9a57 Swapped block placement and destruction buttons
Also capped placement range to match destruction range
2020-05-15 17:39:44 +01:00
Joshua Barretto
5f560d9183 More interesting dungeon features 2020-05-15 17:22:51 +01:00
Joshua Barretto
02647aa8ee More powerful bosses 2020-05-15 16:32:09 +01:00