Commit Graph

4306 Commits

Author SHA1 Message Date
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
4876dd492d fix Changelog.md links 2020-05-16 01:18:50 +02:00
39de4bd4fd swap main background for 0.6 background 2020-05-16 01:07:07 +02:00
ec03c4518a Change the version number to 0.6 2020-05-16 00:50:40 +02:00
408ce30f45 Add Brazilian Portuguese translation 2020-05-15 22:36:22 +00:00
307cbaddb3 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
6b70354fbb Wrap updates in transaction 2020-05-15 16:40:06 -04:00
49e2fb80e7 Update stats in a separate thread 2020-05-15 16:03:51 -04:00
db59a3ca3d Merge branch 'small-fixes' into 'master'
Dungeon Bosses

See merge request veloren/veloren!994
2020-05-15 19:07:11 +00:00
fff4021777 Better spawn town 2020-05-15 19:26:09 +01:00
ba80f7c872 Fixed square staircases in dungeons 2020-05-15 18:34:05 +01:00
51a4d5c402 Fixed incorrect giant names 2020-05-15 18:33:34 +01:00
a338ed3f24 Swapped block placement and destruction buttons
Also capped placement range to match destruction range
2020-05-15 17:39:44 +01:00
93de58252e More interesting dungeon features 2020-05-15 17:22:51 +01:00
fb0c817528 More powerful bosses 2020-05-15 16:32:09 +01:00
aac28d04d5 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
c3e1fd8664 Merge branch 'mockersf/fix-doc-generation' into 'master'
fix doc generation

See merge request veloren/veloren!993
2020-05-15 14:18:15 +00:00
61bcfbeeb2 Changed default map and seed, lowered site counts 2020-05-15 11:36:19 +01:00
71dd520cd6 Merge branch 'shandley/fix-spawn-levels' into 'master'
Fix spawn level bug

See merge request veloren/veloren!987
2020-05-15 04:13:29 +00:00
a41576e767 Correctly set the exp target for the next level when spawning a character.
Removed the unwrap_or from the update method for stats persistence, and
have a dedicated method for updating single rows with a new connection.
2020-05-15 13:27:26 +10:00
cbfe3d52fc Merge branch 'Mckol/552-fix-persistence-crash' into 'master'
Fix #552

Closes #552

See merge request veloren/veloren!984
2020-05-15 00:45:41 +00:00
fe859fc2e1 VELOREN_SAVES_DIR envar now overrides the server persistence db path 2020-05-15 01:54:14 +02:00
48c5d37a5d Make singleplayer use voxygen's config path for persistence path. 2020-05-15 01:54:13 +02:00