618 Commits

Author SHA1 Message Date
CapsizeGlimmer
85d666c6e2 Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
b985531e59 Added option to disable speech bubble icons. Aligned settings>gameplay menu again. 2020-06-27 17:40:03 -04:00
Monty Marz
142a92fca8 icon frame 2020-06-27 17:40:03 -04:00
Monty Marz
69cb03a6be fix dark bubble tail not being displayed correctly 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
0969e33086 Add chat types for offline, online. Implement Pfau's fixes 2020-06-27 17:40:03 -04:00
Pfauenauge90
aaf8aaca13 icons 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
86969c8992 Implement chat mode icons in chat window 2020-06-27 17:03:30 -04:00
Delyth Williams
c4c8235c6b Welsh pixie/armour 2020-06-26 16:26:00 +00:00
Monty Marz
0ff533b149 Merge branch 'WelshPixie/FluffyBunnySlippers' into 'master'
Added fluffy jackalope slippers

See merge request veloren/veloren!1114
2020-06-25 22:07:47 +00:00
Monty Marz
26dcd6657e Merge branch 'WelshPixie/NPCAttackedText' into 'master'
Added text when NPCs attacked

See merge request veloren/veloren!1105
2020-06-25 21:26:30 +00:00
Monty Marz
508d23c4db Merge branch 'WelshPixie/grassets' into 'master'
Welsh pixie/grassets

See merge request veloren/veloren!1106
2020-06-25 21:12:31 +00:00
Delyth Williams
d646a07ee6 Welsh pixie/grassets 2020-06-25 21:12:31 +00:00
WelshPixie
bdec773d29 Added fluffy jackalope slippers 2020-06-25 22:47:17 +02:00
WelshPixie
0fe8c2c6c1 Added text when NPCs attacked 2020-06-25 22:45:27 +02:00
WelshPixie
126c93d72b added seven new shoulder armour types 2020-06-25 18:36:24 +02:00
Songtronix
ce5b2b9ffc feat: add server whitelist 2020-06-24 17:36:19 +02:00
Delyth Williams
8b63fe7f15 added new flora 2020-06-15 16:39:21 +00:00
Forest Anderson
6deaae8d74 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Justin Shipsey
509ea38739 asset
missing fix
2020-06-14 09:22:21 +00:00
Monty Marz
46e42cf8f2 fix broken main menu 2020-06-14 02:11:31 +02:00
Yusuf Bera Ertan
f1dab26f67 Add missing strings, fix a few translations 2020-06-08 21:47:30 +00:00
S Handley
c7c336e588 Replace audio files 2020-06-08 16:26:48 +00:00
Shane Handley
4714f8ddc7 Docs, make adding event mappers easier for sfx, remove placeholder
sounds.
2020-06-09 00:41:46 +10:00
Shane Handley
337c277a6b Handle TripleStrike stages individually. 2020-06-08 10:19:42 +10:00
Shane Handley
016ebc7f71 Introduce a ToolCategory so we can ignore the specific type of weapon
when deciding on the SFX to play when wielding/attacking.
2020-06-08 10:19:42 +10:00
Shane Handley
97e8a96586 Target the specific attack types, to handle TripeStrike etc...
Removed the Axe sfx until the animations show the swing
2020-06-08 10:19:41 +10:00
Shane Handley
b543a9855a Add swoosh sounds for additional weapons. 2020-06-08 10:19:41 +10:00
Shane Handley
b131ba5b06 Add initial attack sfx code with bow shot sounds. 2020-06-08 10:19:41 +10:00
Pfauenauge90
5b57910575 Added spanish translation file 2020-06-06 21:46:53 +02:00
Pfauenauge90
d43ae06e00 update default keybindings file, en.ron, de_DE.ron 2020-06-06 21:29:35 +02:00
Joey Maher
7051720d12 Adds simple auto walk functionality. Toggleable or push to hold 2020-06-06 13:09:01 -05:00
S Handley
45949e7577 Update CHANGELOG and a TODO, fix safer deserialisation for inventory
data.
2020-06-04 11:44:33 +00:00
Monty Marz
507e0c4d00 update german translation 2020-06-03 19:32:54 +00:00
Monty Marz
2ff1edae28 More item drops 2020-06-03 17:59:09 +00:00
Justin Shipsey
b3c9389268 optimization and tails 2020-06-01 00:33:24 +00:00
Monty Marz
39df00be50 Added 36 Swords
I added 36 sword models to the code.
2020-05-29 18:23:00 +00:00
CapsizeGlimmer
09600dc9cb Redraw dark mode bubbles. Add padding to light mode bubbles. 2020-05-27 13:49:19 +02:00
CapsizeGlimmer
2f38332f7d Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
a0628c7a93 NPCs now call for help when you hit them. Redraw speech bubble dark mode. 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
946729ea7a Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble' 2020-05-27 13:49:17 +02:00
CapsizeGlimmer
b0bae18160 Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget 2020-05-27 13:49:13 +02:00
Justin Shipsey
7bbbf74fc2 orientation animation 2020-05-27 06:41:55 +00:00
Pfauenauge90
637cda50c3 Update help.png 2020-05-25 15:45:05 +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
a6569bc2ae Aeronic/forest tune 2020-05-21 04:09:59 +00:00
Joshua Barretto
833bd30602 Innumerable camera improvements 2020-05-18 23:40:28 +01: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
Monty Marz
7a362810ee Pfau/0.6 bg 2020-05-16 12:48:29 +00:00