flo
9339971032
Music Instruments
2022-08-28 18:48:18 +00:00
flo
e882e62c08
seachapel
2022-08-24 21:50:53 +00:00
Joshua Barretto
51d90707b5
Relaxed automod somewhat
2022-08-23 10:03:06 +01:00
Imbris
275b17be57
Merge branch 'imbris/misc_fix' into 'master'
...
Trade canceling related tweaks, make kill_npcs not leave clutter (and actually remove entities in the first place), and misc tweaks
See merge request veloren/veloren!3555
2022-08-21 16:35:16 +00:00
DaforLynx
656727ecbd
Miscellaneous audio fixes
2022-08-21 05:32:02 +00:00
Imbris
ca66a9f79b
Fix bug in Health::kill that caused Destroy event to never be emitted by preemptively setting is_dead to true
2022-08-20 18:47:09 -04:00
Marcel
3b87bf1e4a
Merge branch 'xMAC94x/slowjob_freeze_reproduction' into 'master'
...
Initial reproduction of the slowjob freezen with par_iter and slowjob,
See merge request veloren/veloren!3546
2022-08-20 20:44:07 +00:00
juliancoffee
69cea513ee
Make comments to be doc-comments
2022-08-20 22:30:25 +03:00
juliancoffee
6319dcfc22
Add more components in /body
...
* Add mass
* Add density
* Add collider.
This one is strange as always, I don't know what's wrong, but debug hitbox
changes only after death. Real one seems to work.
2022-08-20 17:02:08 +03:00
juliancoffee
a371aad05e
Add /body command that allows you to switch body
2022-08-20 15:20:27 +03:00
Marcel Märtens
3eac68000b
all tests shows there is currently no way to keep rayon from work-stealing over scopes and doing really really weird stuff between the ECS threadpool and the slowjob Threadpool. so even if i dont like to have multiple threads i think there is no other workaround than just creating a second threapool for background tasks
2022-08-19 09:50:00 +02:00
Marcel Märtens
8ca458188d
also those dispatcher tricks wont help the test, it still sporadically fails
2022-08-19 09:30:56 +02:00
Marcel Märtens
25d9e5b27e
workaround for https://github.com/rayon-rs/rayon/issues/969
...
Unfortuatly rayon has a bug that if you Threadpool.spawn from inside a parallel iterator from inside a Threadpool.install, that the parallel iterator will BLOCK till the Threadpool.spawn finished, which causes many many lag spikes.
I assume this might be the case for the pictures in the gantt chart where a system took unusual long or had a long pause that was unexplained.
I also raise the number of threads by 1, as this rayon thread will prob be useless in all cases and have no real work to do.
EDIT: it turns out the tests are sporadicly failing and this soluction doesnt work
2022-08-19 09:30:00 +02:00
Marcel Märtens
c968e5c748
Initial reproduction of the slowjob freezen with par_iter and slowjob,
...
See that we spawn 2 jobs in the first loop, the loop seems to NOT complete until those jobs are executed
Next step is to do everything with plain rayon coding
2022-08-18 12:38:17 +02:00
Tormod Gjeitnes Hellen
e306b3bfe3
Have the ambushers say something.
...
Very unsure about the way I did this...
2022-08-17 23:50:09 +02:00
Marcel
c6bcdd7a2c
Merge branch 'juliancoffee/i18n-tooling-fluent' into 'master'
...
Implement i18n-tooling
See merge request veloren/veloren!3536
2022-08-17 20:39:00 +00:00
juliancoffee
847ee1c1b1
Implement i18n-tooling
...
* Working csv export
* Working i18n-check
2022-08-17 22:46:48 +03:00
DaforLynx
daadf3abdb
Gnarling Fort music; more specific sites; fix music spacing; new sfx
2022-08-14 01:57:58 +00:00
Samuel Keiffer
a1b5f53d15
Merge branch 'craft-all' into 'master'
...
Craft all
See merge request veloren/veloren!3525
2022-08-12 00:47:48 +00:00
Julio Cezar Silva
9315482fc4
Craft all
2022-08-12 00:47:48 +00:00
Joshua Barretto
602de267b1
Perform validation on all kinds of chat message
2022-08-11 11:11:33 +01:00
Joshua Barretto
52bd7b2485
Added automod
2022-08-11 11:09:52 +01:00
IsseW
87821d5c1d
force update counter
2022-08-09 19:22:09 +02:00
Isse
0471e78f41
spectate mode :D
2022-08-09 18:43:13 +02:00
Imbris
d5b59c2bb7
Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage
2022-08-08 00:38:20 -04:00
juliancoffee
f2df1adf27
Improve documentation
2022-08-07 16:21:58 +03:00
juliancoffee
8ba50e62d5
New i18n implementation based on Fluent
2022-08-06 21:45:23 +03:00
Samuel Keiffer
abf0a27323
Merge branch 'sam/remove-cr-ui' into 'master'
...
Removed weapon CR from UI.
See merge request veloren/veloren!3497
2022-07-30 16:22:29 +00:00
Sam
29dd9eac9b
Remvoed CR from UI. Changed all stats in tools and armor to be same size. Cleaned up item stats UI code.
2022-07-28 19:19:20 -04:00
Sam
28a4ce9be1
Various tweaks
2022-07-26 19:44:49 -04:00
Marcel Märtens
ffe7b2158d
put light_emitters in par_loop to improve the runtime of the campfire lit out loop
2022-07-18 20:56:28 +02:00
Forest Anderson
67534488b3
Merge branch 'tygyh/CleanUp' into 'master'
...
Tygyh/clean up
See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
Youssef Fahmy
91c85dea22
Humanoid Model Overhaul
2022-07-16 11:13:24 +00:00
tygyh
120ee6b6c0
Fix typos
2022-07-15 18:59:37 +02:00
tygyh
25e20b5fa0
Remove unecesssary lifetimes
2022-07-15 16:20:15 +02:00
tygyh
cbe4d9d807
Remove unused imports
2022-07-15 16:00:27 +02:00
tygyh
fefe745508
Reorder impl member order to match trait member order
2022-07-15 15:54:32 +02:00
tygyh
5e5698249b
Remove unnecessarily qualified paths
2022-07-15 14:49:46 +02:00
Christof Petig
2dce472d1f
Merge branch 'christof/modular-weapon-prices' into 'master'
...
Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list
See merge request veloren/veloren!3469
2022-07-14 18:24:21 +00:00
Isse
1e3b5383cf
Merge branch 'zesterer/better-rain' into 'master'
...
Better rain
See merge request veloren/veloren!3464
2022-07-13 23:25:33 +00:00
Christof Petig
bb952fe755
rustfmt the last cleanup
2022-07-13 23:38:11 +02:00
Christof Petig
edfe6d887e
final polish
2022-07-13 23:32:20 +02:00
Christof Petig
eab062450a
clippy helped to get rid of one level of indirection
2022-07-13 23:27:17 +02:00
Christof Petig
d2aa9028ec
clippy is right about this flat_map
2022-07-13 23:17:22 +02:00
Christof Petig
197f84a360
returning a vec creates much more readable code
2022-07-13 23:03:58 +02:00
Christof Petig
3bdeb77268
Full support for modular weapon in loot table read
2022-07-13 22:56:52 +02:00
Christof Petig
a0749ac9bc
test passes, not happy with implementation yet
2022-07-13 20:15:28 +02:00
Christof Petig
5bbb73bc17
changelog + remove dead code, but the test still fails
2022-07-13 20:15:28 +02:00
Christof Petig
5ee72f8a5e
fix test; add tusk, crest, pincer
2022-07-13 20:15:28 +02:00
Christof Petig
8c5901516e
clean up
2022-07-13 20:15:28 +02:00
