Ben Wallis
4b0e2e45ab
Added Skills and Skill Groups for characters
2020-07-04 15:25:04 +01:00
Joshua Yanovski
4e02024670
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-07-04 16:17:40 +02:00
Piotr Korgól
aefa7e2f11
Make chests and enemies use the basic loot table
2020-07-04 14:07:10 +02:00
Joshua Yanovski
50a64d927e
Fix far plane.
2020-07-04 13:07:03 +02:00
unknown
9968398ea8
Added stuff to loot table
2020-07-04 12:40:28 +02:00
Piotr Korgól
d101d7f132
Implemented a lottery system
2020-07-04 12:40:27 +02:00
Marcel Märtens
fe47b11345
instead of trying to connect for 80 minutes, just try 4 mins, added Changelog
2020-07-04 12:37:50 +02:00
Marcel Märtens
e7195b57ad
extend network with better Error codes for Network
2020-07-04 12:32:52 +02:00
Marcel Märtens
cbfd398035
remove Mutex in server as Stream is now 'Sync'
2020-07-04 12:31:59 +02:00
Marcel
e05c9267a7
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
6de2eadeb0
make crash -> error for now
2020-07-04 10:32:52 +02:00
Forest Anderson
c7ffe3dbeb
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
37b5bcbb47
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
1da6f15a43
fixing various smaller network party from issue 657
2020-07-04 02:04:33 +02:00
Forest Anderson
aaaff6a9c7
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
316f702ef1
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
c590bf7b65
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
954a4857c4
Added proper training dummy model
2020-07-03 16:53:04 -04:00
Forest Anderson
c525358637
Prevent xp gain from training dummy kill
2020-07-03 16:53:04 -04:00
Forest Anderson
6140555e43
Fixed clippy issues
2020-07-03 16:53:04 -04:00
Forest Anderson
e73ec7a4d2
Added spawning test dummy
2020-07-03 16:53:04 -04:00
Forest Anderson
05d4dd0556
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
c8f895a0ee
Added lfsconfig file
2020-07-03 16:40:28 -04:00
Marcel Märtens
f9895a7800
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
1f05446ce6
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
209834d782
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
85d1d4b3ff
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
15ff58cd6a
simple fmt in order to make the replacement commit as simple as possible
2020-07-03 13:11:44 +02:00
Marcel Märtens
4e92c0160e
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
77c90b2c7c
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
3473fd215b
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
95a799cf85
fix artifacts, cleanup
2020-07-03 12:17:55 +02:00
Joshua Yanovski
7dd06da34c
Add shadows.glsl.
2020-07-02 22:25:35 +02:00
Joshua Yanovski
618a18c998
Adding shadows, greedy meshing, and more.
2020-07-02 22:10:22 +02:00
Forest Anderson
66f139eb93
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
0d5937ad1c
Added tokeignore for Cargo.nix
2020-07-02 12:14:01 -04:00
Monty Marz
4e9e757f1b
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
89400264dc
Loot ChatType, Update german translation, map zooming
2020-07-01 19:05:44 +00:00
Marcel
f9a7dbaa77
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
cb9ce690e0
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
d53b51954b
Added ability to use 2 x 1h weapons or shields
2020-07-01 17:51:06 +08:00
Marcel Märtens
e1b27c51f5
fix clippy issues in tests and add it to CI
2020-07-01 00:37:15 +02:00
Marcel Märtens
6535fa5744
fix various clippy issues
2020-07-01 00:37:06 +02:00
Songtronix
97a446f2f9
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
a63dfe5581
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
44203ab817
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
bb5d91edca
Use find folder to locate debug dir
2020-06-30 18:54:42 +08:00
Kevin Glasson
2a42949df1
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
4a8443f743
Update es_la.ron
2020-06-29 14:19:12 +00:00
Marcel
de1f970088
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
