Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,811 Commits 151 Branches 18 Tags
Commit Graph

4811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
a00592a0f3 Merge branch 'imbris/small-fixes' into 'master' 
Some improvements

See merge request veloren/veloren!1273
 2020-08-07 08:52:50 +00:00
Imbris
c996626181 Tooltips now disappear when hovered and no longer appear on top of the mouse position (e.g. in the bottom of the inventory) 2020-08-07 03:30:17 -04:00
Imbris
f656bfaddf Avoid cloning armor/tool in tooltip generation, add temporary case for legacy item descriptions 2020-08-07 01:25:51 -04:00
Justin Shipsey
251d108db9 Merge branch 'nepo/dullahan' into 'master' 
nepo/dullahan

See merge request veloren/veloren!1266
 2020-08-07 03:57:00 +00:00
nepo
b8cb8ec68b nepo/dullahan 2020-08-07 03:56:59 +00:00
Joshua Yanovski
3a80b63e6a Merge branch 'sharp/fix-migration-issues' into 'master' 
Fix various migration issues.

See merge request veloren/veloren!1268
 2020-08-07 00:37:26 +00:00
Joshua Yanovski
3e3da609f4 Fix various migration issues. 2020-08-07 01:35:51 +02:00
Marcel
0d0845c32e Merge branch 'patch-2' into 'master' 
I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. I hope it's the last fix and that it finally appears in the next update.

See merge request veloren/veloren!1262
 2020-08-06 23:05:41 +00:00
Yusuf Bera Ertan
9e743baa99
change treeculler crate from git to published version 2020-08-07 01:53:49 +03:00
Forest Anderson
80dc1892e3 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
2b6f4a1747 Removed commented code 2020-08-06 10:15:24 -05:00
Sam
fd745a4d11 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
ab594a97fb More weapon and hit box tweaks 2020-08-06 09:43:47 -05:00
Silentium2318
36e464dbf3 Weapon balancing 2020-08-06 09:39:49 -05:00
Silentium2318
31a54ce99a Dis some distance and attack arc tweaking 2020-08-06 09:39:09 -05:00
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