Silentium2318
|
5a73d48e3b
|
Weapon balancing
|
2020-08-06 09:38:22 -05:00 |
|
Songtronix
|
7afb9866f6
|
Merge branch 'revert-a0b1259b' into 'master'
Revert "Merge branch 'BottledByte/ability_design' into 'master'"
See merge request veloren/veloren!1265
|
2020-08-06 12:53:43 +00:00 |
|
Imbris
|
8f813a3773
|
Revert "Merge branch 'BottledByte/ability_design' into 'master'"
This reverts merge request !1264
|
2020-08-06 08:04:03 +00:00 |
|
Imbris
|
703da622bb
|
Merge branch 'BottledByte/ability_design' into 'master'
Add ability IDs and use them in GUI
See merge request veloren/veloren!1264
|
2020-08-06 04:44:51 +00:00 |
|
Imbris
|
62268fc201
|
Merge branch 'BottledByte/more_enum_stringification' into 'master'
Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar
See merge request veloren/veloren!1260
|
2020-08-05 21:36:56 +00:00 |
|
BottledByte
|
8cbb43ac30
|
Add ability IDs and use them in GUI
|
2020-08-05 23:00:43 +02:00 |
|
Judge Griesa
|
8d787aee94
|
I did it from scratch to match other languages files. -Deleted some tabs and empty spaces.
|
2020-08-05 16:22:44 +00:00 |
|
BottledByte
|
b8199542e0
|
Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar
Also fixed two wrong asset references and did some .ron formatting
|
2020-08-05 01:21:42 +02:00 |
|
Marcel
|
3a2cfc0593
|
Merge branch 'patch-2' into 'master'
-Added crafting commands missed in the file (Probably the reason why the file...
See merge request veloren/veloren!1257
|
2020-08-03 15:12:27 +00:00 |
|
Judge Griesa
|
2fffdd902e
|
-Added crafting commands missed in the file (Probably the reason why the file wasn't read by the game). Removed some weird whitespaces. Added some NPC lines while attacked.
|
2020-08-03 12:22:07 +00:00 |
|
Marcel
|
1af779cf2b
|
Merge branch 'patch-2' into 'master'
-Removed some white spaces. Added some lines about tips. Fixed some sections.
See merge request veloren/veloren!1251
|
2020-08-03 08:13:41 +00:00 |
|
Imbris
|
64185584b4
|
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
|
52ddb13cff
|
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
|
4a19f1dacc
|
De-enumerized armor variants
|
2020-08-03 03:41:32 +00:00 |
|
Joshua Yanovski
|
8d43b0b828
|
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
|
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 |
|
Judge Griesa
|
87742b98cc
|
-Removed some white spaces. Added some lines about tips. Fixed some sections.
|
2020-07-31 13:36:43 +00: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 |
|