Imbris
511ba7be40
Merge branch 'imbris/tracy-tweaks' into 'master'
...
Improvements for tracy server analysis and other misc tweaks
See merge request veloren/veloren!1891
2021-03-13 22:26:26 +00:00
Imbris
5d21fd448c
Merge branch 'PersianKnight/ImprovedSettings' into 'master'
...
Persian knight/improved settings
See merge request veloren/veloren!1893
2021-03-13 19:45:36 +00:00
Imbris
aff3536ac9
Fix tracy not working in certain areas, add span to chunk gen, missing fmt, remove extra span, make voxygen use INFO level instead of TRACE in tracy mode
2021-03-13 13:30:20 -05:00
PersianKnight
7f750f0a8e
Improve default value of windows_size in Graphics and Help Windows in Interface Settings.
2021-03-13 19:09:38 +03:30
PersianKnight
d81da5f453
The appearance of the reset buttons has improved.
2021-03-13 17:42:52 +03:30
PersianKnight
9f8d82ec39
Fixed Toggle Debug Info from Settings
2021-03-13 17:38:34 +03:30
Imbris
5a32a12f8e
Merge branch 'imbris/fix-server' into 'master'
...
Fix server panic
See merge request veloren/veloren!1890
2021-03-13 08:58:06 +00:00
Imbris
7d3f0c34d5
Fix server panic
2021-03-13 03:57:06 -05:00
Imbris
26df88bcdb
Add tracy entity count plot, span tweaks
2021-03-13 02:59:58 -05:00
Imbris
87a7d7afd1
Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements
...
- remove overwritten logging setting in server-cli
- add server-cli command to load a random area for testing without a client
- make admin add/remove commands modify ingame players instead of needing to reconnect
- add spans to par_join jobs
- added test command that loads up an area of the world
- add tracy-world-server alias
- set debug directives to info for logging
2021-03-13 02:28:59 -05:00
Samuel Keiffer
be84dd1905
Merge branch 'PersianKnight/InterfaceSettings' into 'master'
...
Separated InterfaceSettings from GameplaySettings
See merge request veloren/veloren!1887
2021-03-13 01:55:18 +00:00
Samuel Keiffer
586e45e21d
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
7b132519a2
Many small changes to audio code, mainly sfx - changelog in MR
2021-03-12 15:00:09 -08:00
PersianKnight
e9c4afb47e
Separated InterfaceSettings from GameplaySettings
2021-03-12 22:45:44 +03:30
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
