Commit Graph

2994 Commits

Author SHA1 Message Date
Vechro
377433c2fc Get abs value of maxd and mind 2020-01-31 12:12:57 +02:00
Joshua Barretto
52eb4d5946 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
a76740182d Prevent tamed entities constantly trying to 'return home' 2020-01-29 16:37:46 +00:00
Joshua Barretto
c18e0ade23 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
faa86226c7 Collars 2020-01-29 12:01:28 +00:00
Justin Shipsey
4f90a0dde0 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
908e099aa5 minor anim tweaks 2020-01-29 06:38:08 +00:00
Joshua Yanovski
76060f5360 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
3fa21b3dc7 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
2d9e60e566 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
116bc0d0b2 Fixed logic derp 2020-01-28 01:12:17 +00:00
Joshua Barretto
1bf06530cf 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
d87fc37aa2 Fixed watch compilation issue 2020-01-27 23:59:59 +00:00
Joshua Barretto
e391d6e4fd Added no-assets feature to common 2020-01-27 22:41:30 +00:00
Joshua Yanovski
56a553c968 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
ce54f27531 Add missing translations 2020-01-27 20:34:36 +01:00
Joshua Barretto
3bd3422f8a 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
69cc30343a Fix disclaimer text 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
c7271d43f1 Improve French translation 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
c501b2d0bf Use English instead of saved language if loading fails 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
8946ed8d82 Add missing translations in voxygen
Fix #436
2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
f60a68d96d Improve i18n "get" performances by returning a &str 2020-01-27 19:59:17 +01:00
Joshua Barretto
8aa1970fdf 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
344eb9d45d Added intermittent rolling to NPCs during a chase 2020-01-27 16:18:36 +00:00
Joshua Barretto
de96551f65 Resolved pet alignment issues, added ranged aggro 2020-01-27 15:51:07 +00:00
Treeco
6ada176e54 Bumped up the numbers further, behaves nicer still 2020-01-27 14:28:20 +00:00
Justin Shipsey
11e61f9ab9 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
53e57cb5dc quad_medium animation 2020-01-27 14:16:23 +00:00
Treeco
7334f9782c Made depths behave nicer when zoomed really far out 2020-01-27 12:12:38 +00:00
Joshua Barretto
7a9f6b26e9 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
09f0a5744f Improved NPC spawning and names, made idle NPCs stop before hitting things 2020-01-27 10:58:33 +00:00
Joshua Barretto
4eb5b76d5f Added point light ambiance 2020-01-27 10:58:33 +00:00
Monty Marz
509fcc8ad2 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
80bf0d5698 Change desert sprite colours to fit the ground better 2020-01-27 10:41:07 +00:00
Joshua Barretto
e45d46ddf7 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
d2e0445b34 Added point light ambiance 2020-01-27 01:47:23 +00:00
Joshua Barretto
115ecf15d3 Made stars spin with sun and moon 2020-01-27 01:22:07 +00:00
Joshua Barretto
966a61ad42 Stopped stars popping into existence 2020-01-27 01:03:55 +00:00
Monty Marz
84d48b3a56 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
Monty Marz
981b55837a fix typo in en.ron, fixed unfinished weapons dropping from chests 2020-01-26 22:57:06 +00:00
Joshua Yanovski
287b62946e Merge branch 'sharp/better-is-underwater' into 'master'
Better is_underwater() check.

See merge request veloren/veloren!759
2020-01-26 20:52:56 +00:00
Joshua Yanovski
d1ded0bc83 Merge branch 'treeco/fix-turning-lag' into 'master'
Fixed lag caused when turning the camera with large entity counts

See merge request veloren/veloren!760
2020-01-26 20:42:19 +00:00
Treeco
6bcab1e89b Fixed lag caused when turning the camera with large entity counts 2020-01-26 20:04:56 +00:00
Joshua Yanovski
6d5e42f10b Better is_underwater() check.
Takes rivers into account somewhat, and doesn't take up extra space in
SimChunk.
2020-01-26 16:18:51 +01:00
Joshua Barretto
fda29cd8e9 Merge branch 'zesterer/waystones' into 'master'
Patched waypoint spawning

See merge request veloren/veloren!758
2020-01-26 14:27:46 +00:00
Joshua Barretto
4f0d27690c Patched waypoint spawning 2020-01-26 14:27:11 +00:00
Joshua Barretto
6b4a09af30 Merge branch 'zesterer/waystones' into 'master'
Pathfinding, better AI, waypoints

See merge request veloren/veloren!753
2020-01-26 13:50:30 +00:00
Songtronix
8f64e56817 Merge branch 'patch-1' into 'master'
Do not suggest usage of -Sy on Arch

See merge request veloren/veloren!756
2020-01-26 13:29:06 +00:00
Joshua Barretto
6e2784ba0e Convert to chunk positions for downhill 2020-01-26 13:21:33 +00:00
Joshua Barretto
a4573f6fb2 Use .downhill for waypoint generation 2020-01-26 13:05:28 +00:00