Commit Graph

4009 Commits

Author SHA1 Message Date
Joshua Yanovski
f8376fd5dc Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-21 17:53:57 +02:00
Monty Marz
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
Monty Marz
9d7e0aad12 Aeronic/forest tune 2020-05-21 04:09:59 +00:00
Joshua Yanovski
654f7e0492 Correct backface culling. 2020-05-20 21:22:30 +02:00
Joshua Barretto
012aebbfd6 Merge branch 'zesterer/small-fixes' into 'master'
Camera tweaks

See merge request veloren/veloren!1004
2020-05-19 17:35:43 +00:00
Joshua Yanovski
560501df05 Greedy messhing for shadows. 2020-05-19 17:22:06 +02:00
Forest Anderson
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
Joshua Barretto
f09af7980f Fixed aiming for non-humanoids 2020-05-19 14:47:51 +01:00
Joshua Barretto
5c3a08e450 Updated changelog and fmt 2020-05-19 14:41:08 +01:00
Forest Anderson
cc4dcf0670 Changed to new image 2020-05-19 09:31:10 -04:00
Joshua Barretto
05e6df1b65 Added overhead aiming camera 2020-05-19 14:26:53 +01:00
Forest Anderson
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
Joshua Barretto
2f47d09af4 Comment fixes and fmt 2020-05-19 00:35:58 +01:00
Joshua Barretto
f1b166d15d Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Jan Beich
886cad9103 Enable system assets on more Unices 2020-05-18 15:53:50 +00:00
Joshua Barretto
68e77f43f8 Made figure placement correct with warping 2020-05-18 15:15:58 +01:00
Justin Shipsey
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
Silentium
1673a25e8b Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
Joshua Yanovski
a4d87e1875 Shadow maps work for lantern. 2020-05-17 05:59:00 +02:00
Justin Shipsey
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
Monty Marz
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
Monty Marz
ecb7963730 Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
Marcel
9693fd33ae 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
4876dd492d fix Changelog.md links 2020-05-16 01:18:50 +02:00
Marcel Märtens
39de4bd4fd swap main background for 0.6 background 2020-05-16 01:07:07 +02:00
Marcel Märtens
ec03c4518a Change the version number to 0.6 2020-05-16 00:50:40 +02:00
Imbris
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
Imbris
6b70354fbb Wrap updates in transaction 2020-05-15 16:40:06 -04:00
Imbris
49e2fb80e7 Update stats in a separate thread 2020-05-15 16:03:51 -04:00
Joshua Barretto
db59a3ca3d Merge branch 'small-fixes' into 'master'
Dungeon Bosses

See merge request veloren/veloren!994
2020-05-15 19:07:11 +00:00
Joshua Barretto
fff4021777 Better spawn town 2020-05-15 19:26:09 +01:00
Joshua Barretto
ba80f7c872 Fixed square staircases in dungeons 2020-05-15 18:34:05 +01:00
Joshua Barretto
51a4d5c402 Fixed incorrect giant names 2020-05-15 18:33:34 +01:00
Treeco
a338ed3f24 Swapped block placement and destruction buttons
Also capped placement range to match destruction range
2020-05-15 17:39:44 +01:00
Joshua Barretto
93de58252e More interesting dungeon features 2020-05-15 17:22:51 +01:00
Joshua Barretto
fb0c817528 More powerful bosses 2020-05-15 16:32:09 +01:00
Joshua Barretto
aac28d04d5 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Songtronix
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
Joshua Yanovski
243d0837b8 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-15 14:53:13 +02:00
Joshua Yanovski
04382dc286 WIP: better graphics config, better LOD, shadow maps. 2020-05-15 14:22:17 +02:00
Imbris
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
Shane Handley
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
Mckol
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
Mckol
fe859fc2e1 VELOREN_SAVES_DIR envar now overrides the server persistence db path 2020-05-15 01:54:14 +02:00
Mckol
48c5d37a5d Make singleplayer use voxygen's config path for persistence path. 2020-05-15 01:54:13 +02:00
Imbris
649075c89a Merge branch 'imbris/small-fix' into 'master'
Show main menu even if there are no stats

See merge request veloren/veloren!990
2020-05-14 23:47:34 +00:00
Imbris
eac11ecfe8 Show main menu even if there are no stats 2020-05-14 19:10:27 -04:00
Mckol
aa69046055 Changed the default path of persistence database
Now the default is `./saves/`, it's also configurable.
2020-05-14 22:42:44 +02:00
François Mockers
c757645587 fix links 2020-05-14 22:13:20 +02:00
François Mockers
ae712f77a2 fix iterator type 2020-05-14 22:13:08 +02:00