4331 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	4e5277b3b0	Merge branch 'qutrin/loot-table' into 'master' ... Implement a Lottery system See merge request veloren/veloren!1147	2020-07-04 15:53:37 +00:00
Piotr Korgól	3b7e75fde3	Make chests and enemies use the basic loot table	2020-07-04 14:07:10 +02:00
unknown	38f5b8e004	Added stuff to loot table	2020-07-04 12:40:28 +02:00
Piotr Korgól	61071c4654	Implemented a lottery system	2020-07-04 12:40:27 +02:00
Marcel	e34d385212	Merge branch 'xMAC94x/small-fixes' into 'master' ... make crash -> error for now See merge request veloren/veloren!1152	2020-07-04 10:15:24 +00:00
Marcel Märtens	3c445078af	make crash -> error for now	2020-07-04 10:32:52 +02:00
Forest Anderson	9da07ca4a5	Merge branch 'nancok/fix-es-translations' into 'master' ... Update es_la.ron See merge request veloren/veloren!1151	2020-07-04 03:54:55 +00:00
Marcel	643d6b6f27	Merge branch 'xMAC94x/small-fixes' into 'master' ... fixing various smaller network party from issue 657 See merge request veloren/veloren!1149	2020-07-04 01:37:21 +00:00
Marcel Märtens	c5908dd5f7	fixing various smaller network party from issue 657	2020-07-04 02:04:33 +02:00
Forest Anderson	42299c1eff	Merge branch 'revert-05d4dd05' into 'master' ... Revert "Merge branch 'angel/add-git-lfs-config-file' into 'master'" See merge request veloren/veloren!1148	2020-07-03 22:09:42 +00:00
Forest Anderson	8cc7ec8361	Revert "Merge branch 'angel/add-git-lfs-config-file' into 'master'" ... This reverts merge request !1146	2020-07-03 22:03:17 +00:00
Marcel	406e268ca7	Merge branch 'xMAC94x/net-improve' into 'master' ... crossbeam-channel and log spam See merge request veloren/veloren!1145	2020-07-03 21:06:04 +00:00
Forest Anderson	9ee1a69daf	Merge branch 'angel/add-git-lfs-config-file' into 'master' ... Added lfsconfig file See merge request veloren/veloren!1146	2020-07-03 20:41:22 +00:00
Forest Anderson	ce7e019d44	Added lfsconfig file	2020-07-03 16:40:28 -04:00
Marcel Märtens	6e0651b767	crossbeam-channel and log spam ... - swap out std::mpsc with crossbeam-channel in networking crate - remove log spam by only logging when populating a new cache entry and not on every get	2020-07-03 22:35:29 +02:00
Marcel	93bba77b2e	Merge branch 'xMAC94x/network-switch' into 'master' ... xmac94x/network switch See merge request veloren/veloren!1139	2020-07-03 17:13:58 +00:00
Justin Shipsey	d012eb68a2	Merge branch 'sam/hammerheavyattack' into 'master' ... Secondary attack for hammer See merge request veloren/veloren!1140	2020-07-03 15:40:12 +00:00
Samuel Keiffer	c745b3abfd	Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.	2020-07-03 15:40:12 +00:00
Marcel Märtens	a0c4ffcda1	simple fmt in order to make the replacement commit as simple as possible	2020-07-03 13:11:44 +02:00
Marcel Märtens	c877fbe41b	network layer switch, doing the stuff that might confict. ... - mostly its the message handling put now in a async wrapper - add some fixes to pass without warnings and make clippy happy - some network error handling is ignored, this can be improved but is no blocker	2020-07-03 13:11:38 +02:00
Marcel Märtens	7ba36f6d42	doing a simple 1:1 swap out network coding ... this is the part which prob has less Merge conflics and is easy to rebase the next commit will have prob alot of merge conflics followed by a fmt commit	2020-07-03 13:11:31 +02:00
Monty Marz	c2cf0c4627	Merge branch 'pfau/fix_hud_artifacts' into 'master' ... Fix UI artifacts See merge request veloren/veloren!1143	2020-07-03 11:10:30 +00:00
Monty Marz	2152737f18	fix artifacts, cleanup	2020-07-03 12:17:55 +02:00
Forest Anderson	b4ab5f7754	Merge branch 'angel/add-tokei-ignore' into 'master' ... Added tokeignore for Cargo.nix See merge request veloren/veloren!1141	2020-07-02 16:25:50 +00:00
Forest Anderson	a673352ab9	Added tokeignore for Cargo.nix	2020-07-02 12:14:01 -04:00
Monty Marz	cf7edf0f9d	Merge branch 'pfau/loot_chat_icon' into 'master' ... Loot ChatType, Update german translation, map zooming See merge request veloren/veloren!1138	2020-07-01 19:05:44 +00:00
Monty Marz	72d5013a54	Loot ChatType, Update german translation, map zooming	2020-07-01 19:05:44 +00:00
Marcel	3342e5293b	Merge branch 'scott-c/daggers' into 'master' ... Scott-c/1h-wielding #185 See merge request veloren/veloren!1095	2020-07-01 12:07:35 +00:00
Marcel	dbd54c0a58	Merge branch 'clippy-fixup' into 'master' ... fix various clippy issues See merge request veloren/veloren!1137	2020-07-01 11:38:23 +00:00
scott-c	3d6a4ae462	Added ability to use 2 x 1h weapons or shields	2020-07-01 17:51:06 +08:00
Marcel Märtens	e9e8d48a6e	fix clippy issues in tests and add it to CI	2020-07-01 00:37:15 +02:00
Marcel Märtens	df73cb2676	fix various clippy issues	2020-07-01 00:37:06 +02:00
Songtronix	3f48661132	Merge branch 'kevinglasson/hotfix-anim-hotreloading-compile-error' into 'master' ... Refactor and document hotreloading feature See merge request veloren/veloren!1102	2020-06-30 12:44:53 +00:00
Songtronix	5cdfcd1312	Merge branch 'sam/whitelistfunction' into 'master' ... Adds a command that allows a username to be added or removed from the whitelist Closes #613 See merge request veloren/veloren!1136	2020-06-30 12:21:36 +00:00
Samuel Keiffer	1bd3fb55b5	Adds a command that allows a username to be added or removed from the whitelist	2020-06-30 12:21:36 +00:00
Kevin Glasson	e281fb6af2	Use find folder to locate debug dir	2020-06-30 18:54:42 +08:00
Kevin Glasson	0df1b177f7	Refactor hot reloading ... - Remove conditional compilation in regards to the copying of an `_active` file so that the behaviour is the same accross all platforms. - Simplify code slightly. - Add documentation.	2020-06-30 18:54:42 +08:00
Luciano	93b952491a	Update es_la.ron	2020-06-29 14:19:12 +00:00
Marcel	a27e7576a7	Merge branch 'xMAC94x/tarpaulin-flanky' into 'master' ... increase network sleep in order to fix flanky tests See merge request veloren/veloren!1133	2020-06-29 12:32:52 +00:00
Marcel Märtens	831e0bc0de	increase network sleep in order to fix flanky tests	2020-06-29 14:32:20 +02:00
Marcel	adb1c6f66d	Merge branch 'xMAC94x/docker-compose-fix' into 'master' ... fix server-cli tracing accepting RUST_LOG env var and pass RUST_LOG via... See merge request veloren/veloren!1132	2020-06-29 12:29:07 +00:00
Marcel Märtens	17acbad744	fix server-cli tracing accepting RUST_LOG env var and pass RUST_LOG via docker-compose rather than hardcoding it ... - however RUST_BACKTRACE=1 is still hardcoded as its probably useful - dont spam the server-cli with debug	2020-06-29 11:05:55 +02:00
Marcel	98dcf36bf5	Merge branch 'xvar/failed-to-collect-item-fix' into 'master' ... Fixed inventory full message when pressing the pickup item key in quick succession (#651) See merge request veloren/veloren!1131	2020-06-29 07:58:45 +00:00
Ben Wallis	b929e4499f	Fixed inventory full message when pressing the pickup item key in quick succession (#651)	2020-06-29 07:48:44 +01:00
Marcel	74a583e518	Merge branch 'theduke/fix-milestones-readme-link' into 'master' ... Fix Milestones link in README See merge request veloren/veloren!1127	2020-06-29 06:09:39 +00:00
theduke	42995eb662	Fix Milestones link in README	2020-06-29 00:41:30 -04:00
Forest Anderson	cf33db9e6b	Merge branch 'Swedneck/add-veloren-swedish-translation' into 'master' ... Add swedish translation See merge request veloren/veloren!824	2020-06-29 01:55:18 +00:00
Forest Anderson	2b86e77e82	Merge branch 'polish' into 'master' ... Polish See merge request veloren/veloren!1001	2020-06-29 01:35:42 +00:00
Justin Shipsey	1e2228b54d	Merge branch 'sam/gliderfix' into 'master' ... Fixed glider animation so glider does not block view in first person. See merge request veloren/veloren!1130	2020-06-29 01:35:40 +00:00
Forest Anderson	4edd2151cf	Fixed Veloren spelling	2020-06-28 20:41:22 -04:00