9587 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	3025f043d3	Initial spot implementation	2021-08-28 14:53:30 +01:00
Joshua Barretto	a2e0426d45	Merge branch 'zesterer-master-patch-05234' into 'master' ... Fix warning agents not switching aggro on attack See merge request veloren/veloren!2784	2021-08-24 22:57:50 +00:00
Joshua Barretto	f9580a576c	Fix warning agents not switching aggro on attack	2021-08-24 23:17:52 +01:00
Marcel	4f32bbba2b	Merge branch 'ubruntu/rtsim-iter-partition' into 'master' ... Split up iteration of rtsim entities each tick See merge request veloren/veloren!2756	2021-08-23 21:49:33 +00:00
ubruntu	20e33f5575	Split up iteration of rtsim entities each tick	2021-08-23 21:49:32 +00:00
Samuel Keiffer	9200eb80ff	Merge branch 'sam/fix-summon-raycast' into 'master' ... Fix mindflayer summoning minions inside pillars. Closes #1238 See merge request veloren/veloren!2781	2021-08-23 12:58:12 +00:00
Marcel	a5a87a583c	Merge branch 'flo666/make-block-and-slots-mappable-to-gamepad' into 'master' ... Making Block and Slots1-9 available for gamepad mapping See merge request veloren/veloren!2783	2021-08-23 10:38:35 +00:00
flo	3131c178d6	Making Block and Slots1-9 available for gamepad mapping	2021-08-23 10:38:35 +00:00
Marcel	30c446f8ee	Merge branch 'ubruntu/npcs-ignore-when-busy' into 'master' ... Prevent NPCs from being chat spammed Closes #1301 See merge request veloren/veloren!2780	2021-08-23 07:48:34 +00:00
Sam	790c3669a0	Fix mindflayer summoning minions inside pillars.	2021-08-22 12:21:24 -04:00
Bryant Deters	5983c87120	Check for existing target before initiating interaction	2021-08-21 22:28:26 -05:00
Imbris	2c3b484567	Merge branch 'imbris/some-tweaks' into 'master' ... Add comment on tuple bool field meaning in pathing Closes #758 See merge request veloren/veloren!2778	2021-08-21 16:56:01 +00:00
Ben Wallis	7acae057c5	Merge branch 'xvar/book-doc-gen' into 'master' ... Added cargo cmd-doc-gen to auto-generate the table of commands in the book See merge request veloren/veloren!2776	2021-08-21 16:14:42 +00:00
Ben Wallis	08d8b01a2a	Merge branch 'xvar/fix-add-admin-message' into 'master' ... Fixed the message shown when adding an admin or moderator to show the correct role See merge request veloren/veloren!2777	2021-08-21 15:40:27 +00:00
Imbris	a612631aa4	Add comment on tuple bool field meaning in pathing	2021-08-21 15:19:12 +00:00
Ben Wallis	0c55b7b4b3	Fixed the message shown when adding an admin or moderator to show the correct role	2021-08-21 15:43:33 +01:00
Ben Wallis	c00bca7e93	Added cargo cmd-doc-gen to auto-generate the table of commands in the new players/commands.md page in the book	2021-08-21 13:36:55 +01:00
Samuel Keiffer	4d62b9b937	Merge branch 'ygor/combat-rating-all-stats' into 'master' ... Use all armor stats to calculate combat rating Closes #1285 See merge request veloren/veloren!2770	2021-08-20 21:16:05 +00:00
Marcel	f93843ba23	Merge branch 'xMAC94x/fix_tarpaulin' into 'master' ... simd must be last till we have a propper vek crate update See merge request veloren/veloren!2775	2021-08-20 11:18:00 +00:00
Marcel Märtens	fc98213996	simd must be last till we have a propper vek crate update	2021-08-20 12:44:46 +02:00
Ben Wallis	1f2ef007a9	Merge branch 'xvar/no-more-brown-town' into 'master' ... Explosions no longer change block colours within the radius of a safe zone See merge request veloren/veloren!2774	2021-08-20 08:41:01 +00:00
Ben Wallis	9e35f5ec33	Explosions no longer change block colours within the radius of a safe zone. Doubled the radius of the safe zone in the /home town.	2021-08-20 09:00:55 +01:00
Marcel	ef21c433dc	Merge branch 'xvar/ci-runner-tags' into 'master' ... Added veloren-publish tags and veloren-build tags to CI configuration See merge request veloren/veloren!2537	2021-08-19 08:29:25 +00:00
Marcel Märtens	edce01c336	implement a new tag system for all veloren runners, including ... - project tag: - `veloren/veloren`: for the veloren repo only - `veloren/*`: for projects thats are in the veloren namespace, e.g. usefull for smaller projects that dont have their own tag - `*/*` for projects by 3rd parties, e.g. personal projects - trusted tag: - `owned`: The runner is hosted on veloren hardware - `trusted`: The runner is hosted by a private person, trusted by the veloren devs - NONE: if no special trust is given in a runner - check/build tag: - `check`: a job only performs a check and NO executable is build for users - `build`: the job contains atleast 1 executable that can be run by users - NONE: neither a check nor a executable is build, e.g. usefull for pages or meta jobs - publish tag: - `publish`: this job produces a artifact that is automatically pushed to users - NONE: no artifact is pushed automatically to users - pin tags: - `benchmark`: pin a runner to a specific job for the cause of benchmarks - `veloren/*:macos`: runs on a native macos runner ONLY, this needs to be a modified project tag, as otherwise also normal checks would run on this runner. - NONE: no runner is pinned	2021-08-19 09:23:31 +02:00
Ben Wallis	5b4a7722b1	Added veloren-publish tags and veloren-build tags to CI configuration	2021-08-19 09:08:49 +02:00
Marcel	738136e70f	Merge branch 'alxly/update-ru_RU' into 'master' ... alxly/update-ru_RU: add ru_RU missed translations See merge request veloren/veloren!2757	2021-08-17 12:18:33 +00:00
AlxlY	4b62797f03	alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity	2021-08-16 22:04:17 +02:00
Ygor Souza	54c3adf9af	Use all armor stats to calculate combat rating ... - Added terms to account for poise (stun resistance), max energy bonus, energy reward bonus, and crit power. - The weights were chosen to yield roughly the same CR for each of the 3 types of armor in the same tier. - Weapon rating multiplied by a constant to keep in the same order of magnitude as the other terms.	2021-08-16 19:59:54 +02:00
Samuel Keiffer	5116c31f20	Merge branch 'juliancoffee/balance_update' into 'master' ... Abilitiy tweaks and /make_npc command See merge request veloren/veloren!2769	2021-08-16 16:06:59 +00:00
juliancoffee	09e8ee2b3f	Remove giants	2021-08-16 18:15:01 +03:00
juliancoffee	130ae1f429	Add ori_modifier for DashMelee and nerf it ... * 0.6 -> 0.3 ori modifier during charge in DashMelee	2021-08-16 17:27:59 +03:00
juliancoffee	e24cd2598d	Implement /make_npc	2021-08-16 17:27:59 +03:00
juliancoffee	5941d6731c	Refactor supplement evaluation to use NpcData	2021-08-16 17:27:59 +03:00
juliancoffee	e9dde3ecec	Add MakeNPC admin command	2021-08-16 16:45:36 +03:00
juliancoffee	e3798e5d2a	Abilitiy tweaks ... Buff axe double_strike damage (90 -> 110 for first stage) Decrease initial poise damage for hammer charged (20 -> 5)	2021-08-15 23:20:21 +03:00
Imbris	1fd25c22dd	Merge branch 'juliancoffee/explode_vines' into 'master' ... Make Fireballs explode EnsnaringVines See merge request veloren/veloren!2758	2021-08-14 19:09:05 +00:00
Imbris	16fe011061	Merge branch 'master' into 'master' ... Add WGPU adapter selection using WGPU_ADAPTER See merge request veloren/veloren!2747	2021-08-14 18:09:51 +00:00
Joshua Barretto	95f505e0b0	Merge branch 'zesterer/better-aggro' into 'master' ... Improved aggro system to reduce hyper-focused enemies See merge request veloren/veloren!2767	2021-08-14 13:29:25 +00:00
Joshua Barretto	04a1ff214b	Merge branch 'DanTheOne/missing-volume-numbers' into 'master' ... Add music and sfx volume numbers and a little refactoring See merge request veloren/veloren!2768	2021-08-14 13:04:32 +00:00
DanTheOne	de750e2f46	Refactor sound settings window	2021-08-14 14:24:06 +02:00
DanTheOne	9b555a52dc	Add music and sfx volume numbers	2021-08-14 12:25:21 +02:00
Joshua Barretto	87851293c2	Improved aggro system to reduce hyper-focused enemies	2021-08-14 11:09:33 +01:00
juliancoffee	c2247686db	Make is_mid_air use on_surface().is_none()	2021-08-13 23:16:38 +03:00
Daniil Nemtsev	a5ec81844f	Add WGPU adapter selection using WGPU_ADAPTER	2021-08-13 12:39:44 +00:00
Joshua Barretto	5e7e560c10	Merge branch 'min-persistent-world' into 'master' ... min-persistent-world See merge request veloren/veloren!2662	2021-08-13 12:30:28 +00:00
Marcel	7158ae1936	Merge branch 'update_pt_BR_20210810' into 'master' ... update pt_br translation 2021_08_10 See merge request veloren/veloren!2753	2021-08-13 07:17:01 +00:00
Nícolas Wildner	dc4574aa49	update pt_br translation 2021_08_10	2021-08-13 07:17:01 +00:00
Marcel	cddb827a27	Merge branch 'trade-window-fix' into 'master' ... Small fix for trade window headers See merge request veloren/veloren!2766	2021-08-12 22:50:36 +00:00
Xeriab Nabil	05df63dd79	Small fix for trade window headers	2021-08-12 21:56:38 +03:00
juliancoffee	a82f5ca057	Add comment about fragility of solution	2021-08-12 15:28:58 +03:00