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,925 Commits 151 Branches 18 Tags 2.1 GiB
d3b878de2a
Commit Graph

4925 Commits

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

See merge request veloren/veloren!1273
 2020-08-07 08:52:50 +00:00
Imbris
bdd255beb6 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
d74a1d371e Avoid cloning armor/tool in tooltip generation, add temporary case for legacy item descriptions 2020-08-07 01:25:51 -04:00
Joshua Yanovski
6f90e010b3 Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes 2020-08-07 06:47:30 +02:00
Joshua Yanovski
77a8c7c267 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-07 06:47:10 +02:00
Justin Shipsey
44febaabdf Merge branch 'nepo/dullahan' into 'master' 
nepo/dullahan

See merge request veloren/veloren!1266
 2020-08-07 03:57:00 +00:00
nepo
cb65070aba nepo/dullahan 2020-08-07 03:56:59 +00:00
jshipsey
5929cfa5c7 fixed in-hand arrow bug 2020-08-06 20:47:27 -04:00
Joshua Yanovski
e3e72a3de0 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
6d425f125e Fix various migration issues. 2020-08-07 01:35:51 +02:00
Marcel
433c857573 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
af72c46c02
change treeculler crate from git to published version 2020-08-07 01:53:49 +03:00
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
Joshua Yanovski
b44e442325 Miscellaneous performance improvements. 2020-08-06 13:40:35 +02: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
Joshua Yanovski
be37acf287 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-08-03 05:49:27 +02: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
125d7fc6c4 Abstract over simd vs. repr_c vectors. 
Also some minor improvements to Event size.
 2020-08-03 04:55:31 +02: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
Joshua Yanovski
d4d4956e92 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-08-02 20:56:54 +02:00
Joshua Yanovski
5f3b7294af Fix formatting issues I missed before. 2020-08-02 20:43:52 +02:00
Joshua Yanovski
a428a3ebba Fix clippy warnings, part 1. 
There aer still a bunch of type too complex and
function takes too many arguments warnings that I'll fix later
(or ignore, since in the one case I did fix a function takes too
many arguments warning I think it made the code *less* readable).
 2020-08-02 20:41:51 +02: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