Commit Graph

4634 Commits

Author SHA1 Message Date
Imbris
c118765477 Merge branch 'sharp/os-x-resize' into 'master'
Fix window resizing on OS X.

See merge request veloren/veloren!1256
2020-08-03 03:47:48 +00:00
Imbris
f5aaa4d334 Merge branch 'BottledByte/armor_stringify' into 'master'
De-enumerized armor variants

See merge request veloren/veloren!1255
2020-08-03 03:41:32 +00:00
BottledByte
a167ee98ee De-enumerized armor variants 2020-08-03 03:41:32 +00:00
Joshua Yanovski
4e99a3d142 Fix window resizing on OS X.
Not really clear why this was working on any platform...
2020-08-03 04:40:36 +02:00
Imbris
7d524f6062 Merge branch 'w3yden/overitem_hud' into 'master'
Voxygen/HUD: Display item name over dropped items

See merge request veloren/veloren!1240
2020-08-02 19:54:33 +00:00
w3yden
3e9cfa45bb Voxygen/HUD: Display item name over dropped items
Fix clippy warning: Removed unneeded () in fn style

Fix formatting for fn style
2020-08-02 09:49:39 +02:00
Imbris
aced5f9797 Merge branch 'shandley/collect-block-keyup-fix' into 'master'
Prevent inventory collect events from firing on keyup

See merge request veloren/veloren!1252
2020-08-02 06:49:14 +00:00
Shane Handley
1ae02244bc Prevent keyholds for collect (e) 2020-08-02 15:25:57 +10:00
Imbris
c083c8241b Merge branch 'strings_not_enums' into 'master'
Fixed #590, Removed fine-grained weapon Kind enums and replaced them with Strings

Closes #590

See merge request veloren/veloren!1253
2020-08-02 01:21:33 +00:00
BottledByte
dc91209a7b Removed fine-grained Item enums and replaced them with Strings
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
2020-08-02 01:21:32 +00:00
Imbris
8d31cfd459 Merge branch 'sam/weapon-stats' into 'master'
Weapon stats

Closes #645

See merge request veloren/veloren!1238
2020-08-01 20:08:30 +00:00
Samuel Keiffer
f930f52df5 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Justin Shipsey
bae5352cea Merge branch 'snowram/npcs-rework' into 'master'
npc improvements

See merge request veloren/veloren!1234
2020-08-01 14:41:20 +00:00
Shane Handley
f34894087a Prevent inventory collect events from firing on keyup, which is causing item pickup actions to be called twice. 2020-08-01 20:26:44 +10:00
jshipsey
f167026889 changelog 2020-08-01 02:28:57 -04:00
jshipsey
bcc257f893 cleanup, last tweaks 2020-08-01 02:19:45 -04:00
jshipsey
aa3bdc42d7 arming the cyclops 2020-08-01 02:19:45 -04:00
Snowram
1421517f84 Add frog npc, tweak pig model 2020-08-01 02:19:45 -04:00
jshipsey
487131efb8 cyclops run anim 2020-08-01 02:19:45 -04:00
Snowram
990762ba76 Bonerattler tweaks 2020-08-01 02:19:45 -04:00
jshipsey
5d2be2240e maneater and feed anim 2020-08-01 02:19:45 -04:00
Snowram
90d7485c38 Add troll, truffler and wendigo npcs 2020-08-01 02:19:45 -04:00
jshipsey
8991b60929 catoblepas, bonerattler, rabbit, improved anims 2020-08-01 02:19:44 -04:00
jshipsey
baf67f303e new models, anim tweaks 2020-08-01 02:19:44 -04:00
Snowram
3524d644f5 Various changes to npcs animations
- Improved dragon run with tilting
- New run animation for quadsmall, added tilting
2020-08-01 02:19:43 -04:00
Snowram
a0da059676 Skeleton rework with rough offsets 2020-08-01 02:19:43 -04:00
Imbris
830fa3e9e0 Merge branch 'imbris/fix' into 'master'
Fix glyph too large panic

See merge request veloren/veloren!1250
2020-07-31 06:31:22 +00:00
Imbris
f589564760 Fix glyph to large panic 2020-07-31 01:13:31 -04:00
Marcel
66c7a18403 Merge branch 'xMAC94x/test_other_auth' into 'master'
switch to auth that doesn't use agent

See merge request veloren/veloren!1249
2020-07-30 23:44:53 +00:00
Marcel Märtens
7f97baca70 switch to auth that doesn't use agent 2020-07-31 01:05:01 +02:00
Marcel
151fd2bb8c Merge branch 'Judge_Griesa/es_la_translation' into 'master'
Judge griesa/es la translation

See merge request veloren/veloren!1244
2020-07-30 10:22:10 +00:00
Marcel
0203854bd3 -Update on Latinamerican Spanish translation!
Some spell check and changed some words for others to have a better context.
2020-07-30 10:22:09 +00:00
Marcel
18f93bb3a0 Merge branch 'updateauth' into 'master'
update auth to newest version

See merge request veloren/veloren!1242
2020-07-29 17:53:22 +00:00
Marcel Märtens
0d5e61c4b6 update auth to newest version 2020-07-29 19:28:22 +02:00
Marcel
9f53a4a19f Merge branch 'vzikl/add-zh-translation' into 'master'
add zh_CN support and chinese ttf fonts

See merge request veloren/veloren!1241
2020-07-29 14:35:47 +00:00
VZIKL
4d157ece01 add some chinese language 2020-07-29 21:09:19 +08:00
Marcel
b7f88b7e9f Merge branch 'update_authc' into 'master'
update auth to the newest version and remove useless dep

See merge request veloren/veloren!1239
2020-07-28 23:21:13 +00:00
Marcel Märtens
96cde882ef update auth to the newest version and remove useless dep 2020-07-29 00:05:23 +02:00
VZIKL
e56434d443 add zh_CN support and add chinese ttf fonts 2020-07-28 21:39:51 +08:00
Marcel
598f14b258 Merge branch 'yusdacra/update-tr-translation' into 'master'
tr_TR localization: add missing and update some keys

See merge request veloren/veloren!1229
2020-07-27 08:16:20 +00:00
Marcel
400090f897 Merge branch 'snowram/french-translation' into 'master'
fr_FR: Loading tips and villagers attack speech

See merge request veloren/veloren!1230
2020-07-27 08:16:14 +00:00
Imbris
ae9f4d5a53 Merge branch 'imbris/resize-fix' into 'master'
Fix filtering out resize events in the ui

See merge request veloren/veloren!1232
2020-07-26 23:27:53 +00:00
Imbris
ba14440a49 Fix filtering out resize events in the ui 2020-07-26 18:21:20 -04:00
Yusuf Bera Ertan
a76d2d3746
tr_TR localization: add missing and update some keys 2020-07-26 12:59:40 +03:00
Imbris
1123073bfd Merge branch 'sam/arrow-charged-shot' into 'master'
Bow charged shot attack

See merge request veloren/veloren!1226
2020-07-26 03:06:53 +00:00
Samuel Keiffer
827b91d691 Bow charged shot attack 2020-07-26 03:06:53 +00:00
Imbris
9156dbadb8 Merge branch 'sam/armor-fixes' into 'master'
Armor fixes

See merge request veloren/veloren!1222
2020-07-25 23:57:04 +00:00
Samuel Keiffer
527e7a329e Armor fixes 2020-07-25 23:57:04 +00:00
Imbris
c63a1d64e2 Merge branch 'imbris/fix' into 'master'
Make video mode selection slightly better

See merge request veloren/veloren!1227
2020-07-25 22:25:30 +00:00
Imbris
6435464d00 Make video mode selection slightly better 2020-07-25 17:07:50 -04:00