Imbris
fcdd7f1c8b
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
bc75a8b769
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
0127832172
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
7c0fe70453
Improve default value of windows_size in Graphics and Help Windows in Interface Settings.
2021-03-13 19:09:38 +03:30
PersianKnight
42d57ccb92
The appearance of the reset buttons has improved.
2021-03-13 17:42:52 +03:30
PersianKnight
e3c0ceb9fa
Fixed Toggle Debug Info from Settings
2021-03-13 17:38:34 +03:30
Imbris
0170acb460
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
3c4829bc4a
Fix server panic
2021-03-13 03:57:06 -05:00
Imbris
2511b8959c
Add tracy entity count plot, span tweaks
2021-03-13 02:59:58 -05:00
Imbris
8d0b776f18
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
4022937da7
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
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
