DaforLynx
7b132519a2
Many small changes to audio code, mainly sfx - changelog in MR
2021-03-12 15:00:09 -08:00
Samuel Keiffer
ec02d686f3
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
1ad6464f46
Fixed broken weapon.
2021-03-12 11:00:54 -05:00
Marcel
9893827b11
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
e36d88d252
handle ticks in a seperate thread that tui on botclient
2021-03-12 11:08:24 +01:00
Marcel
41d4af3046
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
0904563f6a
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
e6417b6b43
Draft of botclient.
2021-03-12 09:28:21 +01:00
Marcel Märtens
170f2db066
lock on streams to allow parallel send
2021-03-12 09:25:12 +01:00
jshipsey
dda4d2e218
intitial values
2021-03-12 00:58:12 -05:00
Samuel Keiffer
0210d6a154
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
c78e5a044d
Merge branch 'synis/castles-cont' into 'master'
...
Castle generation
See merge request veloren/veloren!1881
2021-03-12 01:49:26 +00:00
Sam
4e48881497
Rebalanced crit stats
2021-03-11 20:30:15 -05:00
Marcel
8aebd89ca4
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
a62efc02d4
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
c63adbaf2b
Addressed comments
2021-03-11 23:51:57 +01:00
Marcel
07b134da27
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
f796b6edb4
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
90838be796
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
efad60016c
Castle generation
2021-03-11 22:17:31 +01:00
Joshua Barretto
c37aa206f5
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
c3c319dae8
Made /time relative to the current day for day-relative times
2021-03-11 19:13:19 +00:00
PersianKnight
186ab9b1c4
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings
2021-03-11 22:09:30 +03:30
Marcel Märtens
025b408e0c
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
19c404b7f6
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
5e5ec967d1
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
2a71c68fa2
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
aa2a5a2549
fix tracy
2021-03-11 17:05:17 +01:00
Marcel Märtens
eacb60cfa0
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
a38e4a9c8b
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
052a69a493
Cheaper and less broken material reflection/glow
2021-03-11 13:56:11 +00:00
Marcel Märtens
db4e86a38b
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
71b5f79e2b
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
22eb7438e0
File structure for lang es_ES aligned with EN
2021-03-11 12:08:37 +00:00
Marcel
23544c3aca
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
e11ee82c44
Fixed clippy
2021-03-10 21:10:08 +01:00
Joshua Barretto
fb84ec1821
More reflective weapons
2021-03-10 18:59:04 +00:00
Joshua Barretto
c20abd0265
Initial implementation of glow/shininess
2021-03-10 18:58:25 +00:00
ccgauche
831758a07d
Delete veloren_plugin_template.plugin.tar
2021-03-10 19:37:24 +01:00
ccgauche
8b1c74759b
Change Ecs access system to allow write accesses to be used + reintroduced get_player_name
2021-03-10 19:36:53 +01:00
Marcel
c0f63b11c5
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
e848bac228
update specs to get rid of old deps
2021-03-10 13:22:17 +01:00
Marcel
211e717ead
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
276e408786
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
0e5f63735b
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
b2d4f9332c
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
ad31b40aea
Validate starting item and body type server-side.
2021-03-09 18:28:25 -05:00
Sam
a452aff112
Made migration more explicit in what skills it targeted, instead of using a LIKE query.
2021-03-09 18:03:12 -05:00
Sam
472a665826
Auras will now refresh buffs if a buff was already present that had a lesser duration.
...
Attack effects can now have multiple requirements.
Fix for sceptre heal not requiring energy.
Nerfed warding aura protection.
Added icon for warding aura.
Changelog.
2021-03-09 18:03:06 -05:00
Sam
0f1f8c89f5
Sceptre skill tree and migration.
2021-03-09 18:02:07 -05:00
