Joshua Barretto
6d2a2fa918
Merge branch 'DaforLynx/aura-sfx' into 'master'
...
Adds sfx for Sceptre aura
See merge request veloren/veloren!1932
2021-03-17 23:54:50 +00:00
DaforLynx
53362d02ed
Adds sfx for Sceptre aura
2021-03-17 23:54:49 +00:00
Marcel
55fa5839f9
Merge branch 'xMAC94x/harden-threads' into 'master'
...
add a check that at least 1 thread works for slowJobPool and for every configuration
See merge request veloren/veloren!1930
2021-03-17 14:24:48 +00:00
Marcel Märtens
65352d771d
add a check that at least 1 thread works for slowJobPool and for every configuration
2021-03-17 14:36:58 +01:00
Marcel
07f2cdc64e
Merge branch 'tormeh/add-monologue-strings' into 'master'
...
Add monologue strings.
See merge request veloren/veloren!1925
2021-03-17 08:45:27 +00:00
Marcel
482555453c
Merge branch 'xMAC94x/fix_slowjob' into 'master'
...
slowjob: allow at least 1 job of every type
See merge request veloren/veloren!1929
2021-03-17 08:08:12 +00:00
Marcel Märtens
0c97984a9e
slowjob: allow at least 1 job of every type
2021-03-17 08:26:43 +01:00
Marcel
20f24896db
Merge branch 'vfoulon80/fr-skills' into 'master'
...
[FR] translate skills.ron + missing keys
See merge request veloren/veloren!1901
2021-03-17 01:25:12 +00:00
Vincent Foulon
a7ebe97f7b
[FR] translate skills.ron + missing keys
2021-03-17 01:25:11 +00:00
Tormod G. Hellen
998010bd6d
Add monologue strings.
2021-03-17 01:58:12 +01:00
Marcel
8ac43e0847
Merge branch 'pfau/09BG' into 'master'
...
0.9 background, 10 fire staffs, improved starting gear visuals
See merge request veloren/veloren!1919
2021-03-16 23:23:24 +00:00
Monty Marz
d8d965a66a
new loading bg, staff models
...
item images
fix paths
loot tables, adjustments
Update main.ron
2021-03-16 23:23:24 +00:00
Marcel
3a66189bbc
Merge branch 'james/fix-npc-chat-spam' into 'master'
...
Correct npc chat spam
See merge request veloren/veloren!1921
2021-03-16 23:22:48 +00:00
James Melkonian
cec5dee242
merchants no longer run away while trading
...
(this time without refactoring)
2021-03-16 23:22:48 +00:00
Marcel
e0cba3928c
Merge branch 'fix_ci' into 'master'
...
fix ci
See merge request veloren/veloren!1924
2021-03-16 22:32:17 +00:00
Marcel Märtens
f5ba496cd0
fix ci
2021-03-16 23:31:40 +01:00
Marcel
43bac70307
Merge branch 'xMAC94x/bots' into 'master'
...
bots: add option to join the world via ingame cmd
See merge request veloren/veloren!1923
2021-03-16 22:25:08 +00:00
Marcel
4d02f8f426
Merge branch 'ubruntu/issue983' into 'master'
...
scan_fmt -> 0.2.6
Closes #983
See merge request veloren/veloren!1911
2021-03-16 22:23:23 +00:00
Marcel
03b90d67c9
Merge branch 'aweinstock/forcedupdate-interpolation' into 'master'
...
Apply ForcedUpdate messages to the interpolation system, potentially improving...
See merge request veloren/veloren!1917
2021-03-16 22:23:04 +00:00
Marcel
998b03c154
Merge branch 'sam/nerfs' into 'master'
...
Nerfs
See merge request veloren/veloren!1922
2021-03-16 22:22:04 +00:00
Marcel
61aa7660ee
Merge branch 'sam/invuln-fixes' into 'master'
...
Safezone fixes
See merge request veloren/veloren!1920
2021-03-16 22:20:42 +00:00
Marcel
a67d7c08e6
Merge branch 'aweinstock/fix-mounting-20210316' into 'master'
...
Fix mounting by making deferred {pos,vel} writes optional in physics.
See merge request veloren/veloren!1918
2021-03-16 22:20:16 +00:00
Sam
11a43f232e
NPCs no longer target players inside safezones (and consider them to be defeated)
...
Warding aura no longer sometimes bypasses safezone invulnerability
2021-03-16 15:17:08 -04:00
Avi Weinstock
9bb42e0e99
Fix mounting by making deferred {pos,vel} writes optional in physics.
2021-03-16 14:04:28 -04:00
Marcel Märtens
1cd798af0d
bots: add option to join the world via ingame cmd
2021-03-16 18:45:42 +01:00
Avi Weinstock
67368dbc58
Apply ForcedUpdate messages to the interpolation system, potentially improving the handling of teleports.
2021-03-16 11:55:01 -04:00
Marcel
1621f805f8
Merge branch 'xMAC94x/slowjob' into 'master'
...
instead of using tokio::Threadpool for CPU bound long running tasks, use rayon, but drip feed and limit the tasks
See merge request veloren/veloren!1912
2021-03-16 15:28:28 +00:00
Marcel
c846caa355
Merge branch 'zesterer/network-tweaks' into 'master'
...
Prevent component inserts being immediately invalidated
See merge request veloren/veloren!1916
2021-03-16 15:28:10 +00:00
Joshua Barretto
f5fe264bd9
Prevent component inserts being immediately invalidated
2021-03-16 14:24:23 +00:00
Marcel
d9d05f3698
Merge branch 'zesterer/network-tweaks' into 'master'
...
Fixed missed component insert bug
See merge request veloren/veloren!1915
2021-03-16 13:05:35 +00:00
Marcel Märtens
0f405626e8
create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it
2021-03-16 13:31:04 +01:00
Joshua Barretto
6dd091d02d
Fixed missed component insert bug
2021-03-16 12:19:42 +00:00
Marcel Märtens
e4d7597bb3
further experiments via a special Group
2021-03-16 09:59:05 +01:00
Marcel Märtens
c0dcccf1be
experiment with a slowjob that can return data
2021-03-16 09:58:58 +01:00
Marcel
c7a41f6552
Merge branch 'imbris/phys-grid-no-thread-fix' into 'master'
...
Imbris/phys grid no thread fix
See merge request veloren/veloren!1914
2021-03-16 08:54:52 +00:00
Imbris
07bfa05fcb
update changelog, clippy fixes
2021-03-16 04:06:15 -04:00
Imbris
621b41e7d5
Instrument all par joins, defer ubiquitous pos/vel writes with a component instead of using vecs
2021-03-16 03:50:45 -04:00
Imbris
351d2fc9bc
Remove tweaks and plots
2021-03-16 03:50:45 -04:00
Imbris
cc3faf479c
Add tracy plot for showing use_grid
2021-03-16 03:50:45 -04:00
Imbris
fc6434e191
Remove commented out radius list
2021-03-16 03:50:45 -04:00
Imbris
5bc9f584dd
Setup spatial grid for entity versus entity collisions
2021-03-16 03:50:45 -04:00
Joshua Barretto
7599aadeda
Merge branch 'zesterer/network-tweaks' into 'master'
...
Zesterer/network tweaks
See merge request veloren/veloren!1913
2021-03-16 04:11:16 +00:00
Joshua Barretto
f520fcb8c2
Optimised entity sync code, increased animation throttling distance
2021-03-16 02:49:33 +00:00
Joshua Barretto
ee3d9443a1
Increased network throttling for reduced network bandwidth
2021-03-16 02:40:56 +00:00
Marcel
7f995bc63d
Merge branch 'james/alignment' into 'master'
...
Various RtSim and Agent Interaction Fixes
See merge request veloren/veloren!1895
2021-03-16 01:30:36 +00:00
James Melkonian
aef24832b3
Various RtSim and Agent Interaction Fixes
2021-03-16 01:30:35 +00:00
Bryant Deters
6c55b8cbb3
scan_fmt -> 0.2.6
2021-03-15 17:48:21 -05:00
Marcel
779e8892cc
Merge branch 'sam/buff-fix-test' into 'master'
...
Fif Buff Emission
See merge request veloren/veloren!1910
2021-03-15 22:46:44 +00:00
Marcel
53a011ac03
Merge branch 'zesterer/fix-sliding' into 'master'
...
Fixed incorrect velocity snapping on collision
See merge request veloren/veloren!1909
2021-03-15 22:38:43 +00:00
Marcel
6bd2adab2b
Merge branch 'sam/explosion-fix' into 'master'
...
Explosions now take into account hitbox of entity.
See merge request veloren/veloren!1905
2021-03-15 22:26:28 +00:00
