Forest Anderson
|
fbac12d28f
|
Merge branch 'silentium/combat-tweeks' into 'master'
Silentium/combat tweaks
See merge request veloren/veloren!1261
|
2020-08-06 16:27:11 +00:00 |
|
Sam
|
3b1163fa50
|
Removed commented code
|
2020-08-06 10:15:24 -05:00 |
|
Sam
|
83a6e08c7a
|
Removed energy refund on M2 attacks. Re-added custom heights on creatures. Tweaked movement on triple strike.
|
2020-08-06 09:43:50 -05:00 |
|
Silentium2318
|
1c40218de9
|
More weapon and hit box tweaks
|
2020-08-06 09:43:47 -05:00 |
|
Silentium2318
|
1de40154c7
|
Weapon balancing
|
2020-08-06 09:39:49 -05:00 |
|
Silentium2318
|
a59438e3e4
|
Dis some distance and attack arc tweaking
|
2020-08-06 09:39:09 -05:00 |
|
Silentium2318
|
b0f55b3f79
|
Weapon balancing
|
2020-08-06 09:38:22 -05:00 |
|
Songtronix
|
11807c836b
|
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
|
c2f3e1b47f
|
Revert "Merge branch 'BottledByte/ability_design' into 'master'"
This reverts merge request !1264
|
2020-08-06 08:04:03 +00:00 |
|
Imbris
|
a0b1259b7e
|
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
|
4b00decb90
|
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
|
34c87d7a86
|
Add ability IDs and use them in GUI
|
2020-08-05 23:00:43 +02:00 |
|
Judge Griesa
|
da70e59210
|
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
|
ab1c43be84
|
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
|
a717276d81
|
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
|
5b35cb4618
|
-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
|
92115ec39d
|
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
|
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 |
|
Judge Griesa
|
a5930e9676
|
-Removed some white spaces. Added some lines about tips. Fixed some sections.
|
2020-07-31 13:36:43 +00: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 |
|