BottledByte
|
4a19f1dacc
|
De-enumerized armor variants
|
2020-08-03 03:41:32 +00:00 |
|
Imbris
|
24a675802b
|
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
|
c91dc994f9
|
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
|
2307d54101
|
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
|
6c4210f0a5
|
Prevent keyholds for collect (e)
|
2020-08-02 15:25:57 +10:00 |
|
Imbris
|
820804e224
|
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
|
c7a5161b43
|
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
|
191cc6ed91
|
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
|
6f73713c79
|
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
|
459c48b88c
|
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
|
3211472a3b
|
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
|
1fe795839f
|
changelog
|
2020-08-01 02:28:57 -04:00 |
|
jshipsey
|
030f29d102
|
cleanup, last tweaks
|
2020-08-01 02:19:45 -04:00 |
|
jshipsey
|
0eaa41f5ba
|
arming the cyclops
|
2020-08-01 02:19:45 -04:00 |
|
Snowram
|
b37c0962af
|
Add frog npc, tweak pig model
|
2020-08-01 02:19:45 -04:00 |
|
jshipsey
|
2645f9e631
|
cyclops run anim
|
2020-08-01 02:19:45 -04:00 |
|
Snowram
|
d7bafe7fb5
|
Bonerattler tweaks
|
2020-08-01 02:19:45 -04:00 |
|
jshipsey
|
654088820c
|
maneater and feed anim
|
2020-08-01 02:19:45 -04:00 |
|
Snowram
|
1b7cb8cde6
|
Add troll, truffler and wendigo npcs
|
2020-08-01 02:19:45 -04:00 |
|
jshipsey
|
9a4415509c
|
catoblepas, bonerattler, rabbit, improved anims
|
2020-08-01 02:19:44 -04:00 |
|
jshipsey
|
8251fcfa55
|
new models, anim tweaks
|
2020-08-01 02:19:44 -04:00 |
|
Snowram
|
eb5ebdce12
|
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
|
18546d0ba5
|
Skeleton rework with rough offsets
|
2020-08-01 02:19:43 -04:00 |
|
Imbris
|
ea90ddce94
|
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
|
d24ca1a037
|
Fix glyph to large panic
|
2020-07-31 01:13:31 -04:00 |
|
Marcel
|
b823ab0203
|
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
|
0713c1dd54
|
switch to auth that doesn't use agent
|
2020-07-31 01:05:01 +02:00 |
|
Marcel
|
3645e7e035
|
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
|
190cd41182
|
-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
|
3abddae550
|
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
|
e4eb380cdf
|
update auth to newest version
|
2020-07-29 19:28:22 +02:00 |
|
Marcel
|
55b7bd390b
|
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
|
83e4f8e2e7
|
add some chinese language
|
2020-07-29 21:09:19 +08:00 |
|
Marcel
|
74a29cf3b8
|
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
|
451b6fddef
|
update auth to the newest version and remove useless dep
|
2020-07-29 00:05:23 +02:00 |
|
VZIKL
|
eaac2eee69
|
add zh_CN support and add chinese ttf fonts
|
2020-07-28 21:39:51 +08:00 |
|
Marcel
|
9e02620d8b
|
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
|
9011af9cf1
|
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
|
4885407e90
|
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
|
97e602ef68
|
Fix filtering out resize events in the ui
|
2020-07-26 18:21:20 -04:00 |
|
Yusuf Bera Ertan
|
f427627d36
|
tr_TR localization: add missing and update some keys
|
2020-07-26 12:59:40 +03:00 |
|
Imbris
|
3fd81a73eb
|
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
|
b41fff299f
|
Bow charged shot attack
|
2020-07-26 03:06:53 +00:00 |
|
Imbris
|
d1097bace0
|
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
|
527453c54a
|
Armor fixes
|
2020-07-25 23:57:04 +00:00 |
|
Imbris
|
4f31b33556
|
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
|
ed3cea411c
|
Make video mode selection slightly better
|
2020-07-25 17:07:50 -04:00 |
|
Snowram
|
3d01b37e20
|
Loading tips and villagers attack speech
|
2020-07-23 20:31:47 +02:00 |
|
Marcel
|
3ad3d0ec29
|
Merge branch 'lausek/admin-joining' into 'master'
fix #660; Admins should join even if they aren't on whitelist
Closes #660
See merge request veloren/veloren!1219
|
2020-07-23 17:16:52 +00:00 |
|
lausek
|
b870b16c87
|
fix #660; Admins should join even if they aren't on whitelist
|
2020-07-23 17:16:52 +00:00 |
|