Samuel Keiffer
f18cdfd54e
Merge branch 'DaforLynx/more-sound-fixes' into 'master'
...
Small audio-related fixes
See merge request veloren/veloren!1889
2021-03-13 00:38:40 +00:00
DaforLynx
99261bf105
Many small changes to audio code, mainly sfx - changelog in MR
2021-03-12 15:00:09 -08:00
PersianKnight
dcb32a7ff1
Separated InterfaceSettings from GameplaySettings
2021-03-12 22:45:44 +03:30
Samuel Keiffer
bb34a604a7
Merge branch 'slipped/poise' into 'master'
...
poise ability values, melee
See merge request veloren/veloren!1884
2021-03-12 18:25:22 +00:00
Sam
803e42cc01
Fixed broken weapon.
2021-03-12 11:00:54 -05:00
Marcel
bf3e12f39a
Merge branch 'aweinstock/botclient' into 'master'
...
move botclient to client/src/bin/bot
See merge request veloren/veloren!1886
2021-03-12 11:16:29 +00:00
Marcel Märtens
c1d6b1ac75
handle ticks in a seperate thread that tui on botclient
2021-03-12 11:08:24 +01:00
Marcel
bce635c1f5
Merge branch 'xMAC94x/par_network' into 'master'
...
lock on streams to allow parallel send
See merge request veloren/veloren!1885
2021-03-12 09:23:18 +00:00
Marcel Märtens
e001b2cac2
move botclient to client/src/bin/bot
...
start it with:
- (cd client && RUST_BACKTRACE=full RUST_LOG=trace VELOREN_USERDATA_STRATEGY=executable cargo run --bin bot --features="bin_bot")
2021-03-12 09:28:24 +01:00
Avi Weinstock
7301182695
Draft of botclient.
2021-03-12 09:28:21 +01:00
Marcel Märtens
1cb6101326
lock on streams to allow parallel send
2021-03-12 09:25:12 +01:00
jshipsey
49f496e290
intitial values
2021-03-12 00:58:12 -05:00
Samuel Keiffer
d8f2d55923
Merge branch 'sam/crit-balance' into 'master'
...
Rebalanced crit stats
See merge request veloren/veloren!1883
2021-03-12 03:36:01 +00:00
Joshua Barretto
e43b57f119
Merge branch 'synis/castles-cont' into 'master'
...
Castle generation
See merge request veloren/veloren!1881
2021-03-12 01:49:26 +00:00
Sam
66181a7f8c
Rebalanced crit stats
2021-03-11 20:30:15 -05:00
Marcel
1166893fd4
Merge branch 'xMAC94x/docker_quickfix' into 'master'
...
the docker container was missing the ca-certificates root store
See merge request veloren/veloren!1882
2021-03-11 23:09:42 +00:00
Marcel Märtens
767bae540e
the docker container was missing the ca-certificates root store
...
Its now using ubuntus default root-store for tls operations.
2021-03-12 00:08:34 +01:00
Synis
9f9ed4b211
Addressed comments
2021-03-11 23:51:57 +01:00
Marcel
5d32690fbf
Merge branch 'xMAC94x/server_parallize' into 'master'
...
handle msg as part of the servers state for best parallelisation. also include agent there
See merge request veloren/veloren!1878
2021-03-11 21:52:18 +00:00
Marcel
93cab075f8
Merge branch 'xMAC94x/non_blocking_register' into 'master'
...
Auth requests are now done async, the register system is fetching it, via a PendingLogin component
See merge request veloren/veloren!1875
2021-03-11 21:51:55 +00:00
Joshua Barretto
a9bcaf0a37
Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master'
...
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings
See merge request veloren/veloren!1877
2021-03-11 21:29:11 +00:00
Synis
631a591a68
Castle generation
2021-03-11 22:17:31 +01:00
Joshua Barretto
155bb7a146
Merge branch 'zesterer/relative-time-cmd' into 'master'
...
Made /time relative to the current day for day-relative times
See merge request veloren/veloren!1879
2021-03-11 19:25:37 +00:00
Joshua Barretto
235d657c97
Made /time relative to the current day for day-relative times
2021-03-11 19:13:19 +00:00
PersianKnight
3b3ffe30e9
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings
2021-03-11 22:09:30 +03:30
Marcel Märtens
a3e6cf3815
handle msg as part of the servers state for best parallelisation. also include agent there
2021-03-11 19:09:21 +01:00
Joshua Barretto
f479231b15
Merge branch 'glowy-shiny-pretty' into 'master'
...
Glowy shiny pretty
See merge request veloren/veloren!1874
2021-03-11 17:37:33 +00:00
Samuel Keiffer
9b198b5cda
Merge branch 'sam/sceptre-overhaul' into 'master'
...
Overhaul sceptre
Closes #768
See merge request veloren/veloren!1845
2021-03-11 16:47:50 +00:00
Marcel Märtens
728bff610b
Allow HTTP auth servers again.
...
only `localhost` are allowed in a release build.
when debug assertions are on, others are also allowed.
This change undoes the changes to the settings, so compared to master, there is no effect
2021-03-11 17:24:52 +01:00
Marcel Märtens
381bb5eef0
fix tracy
2021-03-11 17:05:17 +01:00
Marcel Märtens
a98e72c391
Auth requests are now done async, the register system is fetching it, via a PendingLogin component
...
The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without.
correct is now `auth.veloren.net`
incorrect is: `https://auth.veloren.net `
2021-03-11 17:05:02 +01:00
Marcel
a3d54e908e
Merge branch 'xMAC94x/terrain_stream' into 'master'
...
Transport ChunkRequests and Chunkupdates in a own stream.
See merge request veloren/veloren!1876
2021-03-11 15:46:51 +00:00
Joshua Barretto
6e0807f3f5
Cheaper and less broken material reflection/glow
2021-03-11 13:56:11 +00:00
Marcel Märtens
f8b7d96066
git push -fTransport ChunkRequests and Chunkupdates in a own stream. ChunkUpdates are very big and having them in a own stream, helps slow clients to keep up with entity syncs and
...
lagging a bit behind on terrain. Which is fine. Block Places and Block Pickup are not handled in this stream, as they go through the standart route of event handling.
2021-03-11 14:50:46 +01:00
Marcel
19a792228c
Merge branch 'oriolmm/file_structure_es_ES_aligned' into 'master'
...
File structure for lang es_ES aligned with EN
See merge request veloren/veloren!1872
2021-03-11 12:08:37 +00:00
omm
ef7b215f07
File structure for lang es_ES aligned with EN
2021-03-11 12:08:37 +00:00
Marcel
3a7ff55dc0
Merge branch 'ccgauche/improved-retrieve-system' into 'master'
...
Improved retrieve system to allow write components to be used + Reintroduced get_player_name
See merge request veloren/veloren!1873
2021-03-11 00:13:54 +00:00
ccgauche
2cbbff7fb9
Fixed clippy
2021-03-10 21:10:08 +01:00
Joshua Barretto
d1b58ebb36
More reflective weapons
2021-03-10 18:59:04 +00:00
Joshua Barretto
09e32cb952
Initial implementation of glow/shininess
2021-03-10 18:58:25 +00:00
ccgauche
908cf16090
Delete veloren_plugin_template.plugin.tar
2021-03-10 19:37:24 +01:00
ccgauche
67b24294d6
Change Ecs access system to allow write accesses to be used + reintroduced get_player_name
2021-03-10 19:36:53 +01:00
Marcel
cf46ce70cf
Merge branch 'xMAC94x/update-specs' into 'master'
...
update specs to get rid of old deps
See merge request veloren/veloren!1871
2021-03-10 13:14:23 +00:00
Marcel Märtens
b151a246c3
update specs to get rid of old deps
2021-03-10 13:22:17 +01:00
Marcel
39f5e969ba
Merge branch 'update_deps' into 'master'
...
Stop required euc version (was done to hold back vek version)
See merge request veloren/veloren!1870
2021-03-10 02:28:44 +00:00
Marcel
524ded586d
Merge branch 'aweinstock/validate-char-create' into 'master'
...
Validate starting item and body type server-side.
See merge request veloren/veloren!1869
2021-03-10 01:42:42 +00:00
Marcel
81959c0a89
Merge branch 'ccgauche/move-back-register-to-system' into 'master'
...
Moved back register to a system
See merge request veloren/veloren!1868
2021-03-10 00:56:33 +00:00
Bryan Quigley
506adb4eec
Stop requiring specfici euc version (was done to hold back vek version)
...
Then ran cargo update
2021-03-09 15:53:24 -08:00
Avi Weinstock
f64c29f09d
Validate starting item and body type server-side.
2021-03-09 18:28:25 -05:00
Sam
d4bdacb2e7
Made migration more explicit in what skills it targeted, instead of using a LIKE query.
2021-03-09 18:03:12 -05:00
