4666 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Imbris	10c3d01466	Add basic group functionality (no voxygen wiring yet)	2020-08-08 01:09:01 +02:00
Imbris	1741384d00	Add entity targeting	2020-08-08 01:09:01 +02:00
Marcel	eaa5bac8d6	Merge branch 'french_translation' into 'master' ... French translation improvements See merge request veloren/veloren!1263	2020-08-07 21:05:47 +00:00
Varpie	54c08babac	Fixing various obsolete texts and a few typos, uniform pronoun (tu->vous) and French style punctuation	2020-08-07 21:05:47 +00:00
Marcel	150b5b48c5	Merge branch 'xMAC94x/translation_tests' into 'master' ... add a translation test that verifys that all language RON files are parseable... See merge request veloren/veloren!1271	2020-08-07 20:13:30 +00:00
Marcel Märtens	599a9a76fc	add a translation test that verifys that all language RON files are parseable (without any git involved)	2020-08-07 21:31:34 +02:00
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
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
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
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