3005 Commits

Author SHA1 Message Date
Songtronix
d77ac45de3 Merge branch 'shandley/temp-music-system' into 'master'
Music system

See merge request veloren/veloren!626
2020-02-03 11:55:32 +00:00
S Handley
d0b9439b44 Move music under audio
Also add some blank time after each track so that we get some silence
between tracks.
2020-02-03 11:55:32 +00:00
Marcel
c4d98c539f Merge branch 'veloren-cleanup' into 'master'
change veloren code style

See merge request veloren/veloren!657
2020-02-02 18:14:11 +00:00
Marcel Märtens
f89407448a apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Marcel Märtens
50b42b5ca9 Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable,
especially enumerations and other source code in errosions file
2020-02-01 21:37:36 +01:00
Marcel Märtens
32b2853e69 change veloren code style 2020-02-01 21:37:31 +01:00
Marcel
ed78b8380c Merge branch 'songtronix/add-new-admin' into 'master'
add new admin to default admin list

See merge request veloren/veloren!779
2020-01-31 21:49:01 +00:00
Marcel
ab4e7fe3aa Merge branch 'xMAC94x/release-numbers' into 'master'
Change the version number to 0.5

See merge request veloren/veloren!775
2020-01-31 17:20:55 +00:00
Marcel Märtens
503be4aa6c Change the version number to 0.5 2020-01-31 17:26:45 +01:00
Joshua Yanovski
1b0e16cf74 Merge branch 'vechro/above-clouds-fix' into 'master'
Fix clouds being invisible from above on certain machines

See merge request veloren/veloren!782
2020-01-31 11:59:28 +00:00
Vechro
156cc6bbcc Get abs value of maxd and mind 2020-01-31 12:12:57 +02:00
Songtronix
01854dfb77 add new admin to default admin list 2020-01-30 19:01:24 +01:00
Joshua Barretto
07e403c6e2 Merge branch 'zesterer/small-fixes' into 'master'
Prevent tamed entities constantly trying to 'return home'

See merge request veloren/veloren!776
2020-01-29 17:00:01 +00:00
Joshua Barretto
9d267c5f20 Prevent tamed entities constantly trying to 'return home' 2020-01-29 16:37:46 +00:00
Joshua Barretto
2b22620d3c Merge branch 'zesterer/not-a-feature' into 'master'
Collars

See merge request veloren/veloren!772
2020-01-29 12:01:28 +00:00
Joshua Barretto
3d8ad41f0a Collars 2020-01-29 12:01:28 +00:00
Justin Shipsey
28326bbd00 Merge branch 'slipped/animtweaks' into 'master'
minor anim tweaks

See merge request veloren/veloren!774
2020-01-29 06:38:08 +00:00
Justin Shipsey
2f753b962f minor anim tweaks 2020-01-29 06:38:08 +00:00
Joshua Yanovski
edb6183460 Merge branch 'sharp/fix-npc-names' into 'master'
Per-species NPC names!

See merge request veloren/veloren!773
2020-01-29 04:47:09 +00:00
Joshua Yanovski
fa853e9e19 Per-speces NPC names!
Is also able to refactor some of the uglier code and introduces a
framework that (suitably extended) could be useful in removing
boilerplate elsewhere.
2020-01-29 04:41:32 +01:00
Joshua Barretto
d6a6986496 Merge branch 'zesterer/no-assets' into 'master'
Fixed logic derp

See merge request veloren/veloren!771
2020-01-28 01:13:23 +00:00
Joshua Barretto
0760273d72 Fixed logic derp 2020-01-28 01:12:17 +00:00
Joshua Barretto
36d9381c79 Merge branch 'zesterer/no-assets' into 'master'
Zesterer/no assets

See merge request veloren/veloren!770
2020-01-28 01:04:00 +00:00
Joshua Barretto
4be037a43d Fixed watch compilation issue 2020-01-27 23:59:59 +00:00
Joshua Barretto
7cec3518a4 Added no-assets feature to common 2020-01-27 22:41:30 +00:00
Joshua Yanovski
f0518ad8ab Merge branch 'optimize_and_fix_i18n' into 'master'
Optimize and fix i18n

Closes #436

See merge request veloren/veloren!743
2020-01-27 22:10:26 +00:00
Rémy PHELIPOT
f96b7c8c82 Add missing translations 2020-01-27 20:34:36 +01:00
Joshua Barretto
16a8d1694e Merge branch 'zesterer/small-fixes' into 'master'
NPC AI bug fixes, improvements

See merge request veloren/veloren!767
2020-01-27 19:05:07 +00:00
Rémy PHELIPOT
3af0be2e15 Fix disclaimer text 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
f01af55444 Improve French translation 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
363687d62b Use English instead of saved language if loading fails 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
8d949ab552 Add missing translations in voxygen
Fix #436
2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
bee7bf8737 Improve i18n "get" performances by returning a &str 2020-01-27 19:59:17 +01:00
Joshua Barretto
2c2a841297 Merge branch 'treeco/fix-zoom' into 'master'
Made depths behave nicer when zoomed really far out

See merge request veloren/veloren!766
2020-01-27 16:48:16 +00:00
Joshua Barretto
db21714a25 Added intermittent rolling to NPCs during a chase 2020-01-27 16:18:36 +00:00
Joshua Barretto
8213748473 Resolved pet alignment issues, added ranged aggro 2020-01-27 15:51:07 +00:00
Treeco
96139823ff Bumped up the numbers further, behaves nicer still 2020-01-27 14:28:20 +00:00
Justin Shipsey
f82c857b2f Merge branch 'slipped/animalfixes' into 'master'
quad_medium animation

See merge request veloren/veloren!763
2020-01-27 14:16:23 +00:00
Justin Shipsey
c91e6a229d quad_medium animation 2020-01-27 14:16:23 +00:00
Treeco
83a78898f2 Made depths behave nicer when zoomed really far out 2020-01-27 12:12:38 +00:00
Joshua Barretto
15b56fab00 Merge branch 'zesterer/small-fixes' into 'master'
Various small fixes

See merge request veloren/veloren!764
2020-01-27 11:26:01 +00:00
Joshua Barretto
95647f10f5 Improved NPC spawning and names, made idle NPCs stop before hitting things 2020-01-27 10:58:33 +00:00
Joshua Barretto
a951ca2ae8 Added point light ambiance 2020-01-27 10:58:33 +00:00
Monty Marz
a6990a715a Merge branch 'pfau/fix-sprite-col' into 'master'
Change desert sprite colours to fit the ground better

See merge request veloren/veloren!765
2020-01-27 10:41:07 +00:00
Monty Marz
fa13eb06b0 Change desert sprite colours to fit the ground better 2020-01-27 10:41:07 +00:00
Joshua Barretto
9dbfecfc86 Merge branch 'zesterer/small-fixes' into 'master'
Star fixes

See merge request veloren/veloren!762
2020-01-27 02:29:05 +00:00
Joshua Barretto
c28c4188fd Added point light ambiance 2020-01-27 01:47:23 +00:00
Joshua Barretto
f301734bda Made stars spin with sun and moon 2020-01-27 01:22:07 +00:00
Joshua Barretto
c9f1e4f22f Stopped stars popping into existence 2020-01-27 01:03:55 +00:00
Monty Marz
2a576fba47 Merge branch 'fix-typo-en-i18n' into 'master'
fix typo in en.ron, fixed unfinished weapons dropping from chests

See merge request veloren/veloren!761
2020-01-26 22:57:06 +00:00