fe47b11345
instead of trying to connect for 80 minutes, just try 4 mins, added Changelog
2020-07-04 12:37:50 +02:00
e7195b57ad
extend network with better Error codes for Network
2020-07-04 12:32:52 +02:00
cbfd398035
remove Mutex in server as Stream is now 'Sync'
2020-07-04 12:31:59 +02:00
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
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
1da6f15a43
fixing various smaller network party from issue 657
2020-07-04 02:04:33 +02:00
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
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
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
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
c8f895a0ee
Added lfsconfig file
2020-07-03 16:40:28 -04:00
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
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
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
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
15ff58cd6a
simple fmt in order to make the replacement commit as simple as possible
2020-07-03 13:11:44 +02:00
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
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
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
95a799cf85
fix artifacts, cleanup
2020-07-03 12:17:55 +02:00
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
0d5937ad1c
Added tokeignore for Cargo.nix
2020-07-02 12:14:01 -04:00
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
89400264dc
Loot ChatType, Update german translation, map zooming
2020-07-01 19:05:44 +00:00
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
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
d53b51954b
Added ability to use 2 x 1h weapons or shields
2020-07-01 17:51:06 +08:00
e1b27c51f5
fix clippy issues in tests and add it to CI
2020-07-01 00:37:15 +02:00
6535fa5744
fix various clippy issues
2020-07-01 00:37:06 +02:00
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
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
44203ab817
Adds a command that allows a username to be added or removed from the whitelist
2020-06-30 12:21:36 +00:00
bb5d91edca
Use find folder to locate debug dir
2020-06-30 18:54:42 +08:00
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
4a8443f743
Update es_la.ron
2020-06-29 14:19:12 +00:00
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
11e7b1f922
increase network sleep in order to fix flanky tests
2020-06-29 14:32:20 +02:00
8f93038027
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
c558c9de7c
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
0a8c896572
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
48a23e5f4c
Fixed inventory full message when pressing the pickup item key in quick succession ( #651 )
2020-06-29 07:48:44 +01:00
807df57f64
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
2dafadcfb7
Fix Milestones link in README
2020-06-29 00:41:30 -04:00
be6d139e26
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
27f7c59e6d
Merge branch 'polish' into 'master'
...
Polish
See merge request veloren/veloren!1001
2020-06-29 01:35:42 +00:00
49a18ac659
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
c50a2c8ac2
Fixed Veloren spelling
2020-06-28 20:41:22 -04:00
4bfe195336
final tweaks in translation
2020-06-28 20:41:22 -04:00
b37ed5f3a4
Fixed some spelling errors and retranslated some sentences to make them sound better
2020-06-28 20:41:22 -04:00
54babe6615
Change uncanny valley to wildness as merged in
...
6c4e3eb00a (be21cb369b4dfb9d7a565ddff0161533680a3583)
2020-06-28 20:41:22 -04:00
