6476 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Snowram	477bdfdfe7	Adresses some comments, various visual tweaks	2021-02-10 00:30:23 +01:00
Snowram	02f446fe4b	Adds lights to dungeons	2021-02-10 00:30:23 +01:00
Samuel Keiffer	155feb8e8a	Merge branch 'sam/better-inventory-loadout-swapping' into 'master' ... Restricts when players can change their loadout to non-attack states See merge request veloren/veloren!1761	2021-02-09 18:23:55 +00:00
Imbris	70cc4ebd8f	Merge branch 'update-native-dialog' into 'master' ... Update native_dialog to 0.5.2 See merge request veloren/veloren!1760	2021-02-09 00:30:38 +00:00
Sam	398fcf7bdd	Changing main tool while in wield state moves character back to idle state.	2021-02-08 17:25:40 -05:00
Snowram	05fe99d7cf	Merge branch 'Sarrakitty/Small_fixes' into 'master' ... Sarrakitty/small fixes See merge request veloren/veloren!1764	2021-02-08 20:37:24 +00:00
Sarra Kitty	a956dad360	Sarrakitty/small fixes	2021-02-08 20:37:24 +00:00
Sam	e033fe6bee	Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead.	2021-02-08 13:55:50 -05:00
Sam	1c83c5ee6f	Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common.	2021-02-08 12:31:17 -05:00
Sam	f026aeb2dc	Server events directly emitted in states now.	2021-02-08 12:01:48 -05:00
Sam	6a1e583d45	Eradicated clones	2021-02-08 12:01:48 -05:00
Sam	9f2255a5de	Extended what states inventory manipulations touching the loadout could affect.	2021-02-08 12:01:47 -05:00
Sam	8eebcdfcd2	Inventory changes that modify the loadout now go through a control action instead of a control event.	2021-02-08 12:01:47 -05:00
Forest Anderson	bcc9c2058c	Merge branch 'angel/add-github-mirror-action' into 'master' ... Added Action that will mirror the Gitlab repo to Github See merge request veloren/veloren!1763	2021-02-08 15:50:50 +00:00
Forest Anderson	2dcfea5638	Added Action that will mirror the Gitlab repo to Github	2021-02-08 09:55:43 -05:00
Samuel Keiffer	f8ea2681a1	Merge branch 'swilliams/mindflayer-loot-table' into 'master' ... Made Mindflayer drops exclusive to the Mindflayer. See merge request veloren/veloren!1762	2021-02-07 19:04:20 +00:00
Scott Williams	ae22a98167	Added a miniboss loot table for the stonework defender, made damaged bag, glider, and root of evil mindflayer exclusive drops.	2021-02-07 19:04:20 +00:00
Imbris	357cb26e05	Update native_dialog to 0.5.2	2021-02-07 00:48:57 -05:00
Samuel Keiffer	909ed80e9e	Merge branch 'sam/fix-roll' into 'master' ... Fixes roll being free See merge request veloren/veloren!1757	2021-02-06 22:15:06 +00:00
Imbris	a5c76a6d36	Merge branch 'trollderim/replace-magic-dr-number' into 'master' ... Replace magic dr constant Closes #915 See merge request veloren/veloren!1756	2021-02-06 20:28:40 +00:00
Sam	252e421692	Roll is no longer free.	2021-02-06 15:20:08 -05:00
Phillipp Mevenkamp	f5e1d446ad	Replace magic dr constant	2021-02-06 18:21:58 +01:00
Imbris	6a193d388d	Merge branch 'james/agent-to-server' into 'master' ... Move agent system to server See merge request veloren/veloren!1750	2021-02-06 06:15:25 +00:00
James Melkonian	1d8496ea21	Move agent system to server	2021-02-06 06:15:25 +00:00
Imbris	2ebe0915f4	Merge branch 'character_ability_refactor' into 'master' ... rel: #938 - Replaces fields in CharacterAbility enum that are integers with a float See merge request veloren/veloren!1752	2021-02-05 01:39:12 +00:00
Pascal Fuhrmann	9f7637ab21	Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts	2021-02-05 01:39:12 +00:00
Imbris	2248b5cc2d	Merge branch 'imbris/fix-test-server' into 'master' ... Fix test server See merge request veloren/veloren!1754	2021-02-04 06:23:09 +00:00
Imbris	b9f404c6f5	fix test server	2021-02-04 00:18:46 -05:00
Samuel Keiffer	c16cddb290	Merge branch 'azymohliad/update-uk' into 'master' ... Update Ukrainian translation See merge request veloren/veloren!1749	2021-02-03 16:18:50 +00:00
Andrii Zymohliad	7be836318b	Update Ukrainian translation	2021-02-03 16:18:49 +00:00
Samuel Keiffer	4cf2a60209	Merge branch 'sam/fix-double-health-fetch' into 'master' ... Fixed bombs panicing the server. See merge request veloren/veloren!1753	2021-02-03 05:42:02 +00:00
Sam	d13302f256	Fixed bombs panicing the server.	2021-02-03 00:41:19 -05:00
Samuel Keiffer	5bb1e4a808	Merge branch 'sam/attack-effects' into 'master' ... Centralized attack handling Closes #818 See merge request veloren/veloren!1746	2021-02-02 22:27:43 +00:00
Sam	be8df9aef6	Addressed comments.	2021-02-02 16:08:09 -05:00
Sam	80954f3ba4	Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps.	2021-02-02 13:07:07 -05:00
Sam	af982ec0bb	Changed knockback to be an effect on the overall attack, rather than a damage.	2021-02-02 13:07:07 -05:00
Sam	17d1432be0	Outcomes now correctly read if an attack had any healing components.	2021-02-02 13:07:06 -05:00
Sam	5eec915c2e	Added support for damage falloff with explosions.	2021-02-02 13:07:06 -05:00
Sam	5c16b0b532	Explosions now use attacks.	2021-02-02 13:07:06 -05:00
Sam	7675e53740	Shockwaves now use attacks.	2021-02-02 13:07:05 -05:00
Sam	e5caef8a54	Effects on attacks can now require energy.	2021-02-02 13:07:05 -05:00
Sam	2b11ae6569	Attacks can now heal.	2021-02-02 13:07:04 -05:00
Sam	edcfcc31f6	Attacks can now deal poise damage.	2021-02-02 13:07:04 -05:00
Sam	fcd89a5d41	Lifesteal now functional on Attack.	2021-02-02 13:07:03 -05:00
Sam	fdef168e82	Beams now use Attack, with limited functionality in some cases.	2021-02-02 13:07:03 -05:00
Sam	59ce8c6843	Projectiles now use attacks.	2021-02-02 13:06:57 -05:00
Sam	46dbb8aef4	Attack effects can now have requirements.	2021-02-02 13:06:34 -05:00
Sam	c77f263cd1	Effects now work when not tied to a damage.	2021-02-02 13:06:34 -05:00
Sam	18aa315f0d	Rolling now dodges melee attacks again.	2021-02-02 13:06:34 -05:00
Sam	78879d5189	Attacks can now inflict de/buffs.	2021-02-02 13:06:33 -05:00