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
Christof Petig
7a1218cf2f
make a recipe of all modular weapons
2022-07-13 20:15:28 +02:00
Christof Petig
3a7835c6d0
replace one Owned reference by the normal Reference type
2022-07-13 20:15:28 +02:00
Avi Weinstock
cea2550dde
Add Item::new_from_item_definition_id.
2022-07-13 20:15:28 +02:00
Christof Petig
7e5ebada2d
still incomplete but looks surprisingly usable
2022-07-13 20:15:28 +02:00
Christof Petig
33a01a0dab
fix compilation of example
2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403
use ItemDefintionId across trade_pricing
2022-07-13 20:15:27 +02:00
Avi Weinstock
27d2cdeb79
WIP modular weapon pricing.
2022-07-13 20:15:27 +02:00
Socksonme
3f0f1c423c
Small fixes
2022-07-12 21:01:47 +00:00
Joshua Barretto
836fe2b1c6
Proper lightning
2022-07-09 01:59:18 +01:00
Joshua Barretto
4531a4e3f9
Added lightning
2022-07-08 23:26:33 +01:00
Joshua Barretto
28bc9db198
Better cloud cover
2022-07-08 18:09:13 +01:00
Joshua Barretto
853d622e19
Better fall rate
2022-07-08 16:41:31 +01:00
Joshua Barretto
23aea72466
Fixed fall rate
2022-07-08 16:09:36 +01:00
Isse
c0f06dcb8a
Merge branch 'socksonme/fix_crushing_damage_crit' into 'master'
...
Group up extra damage from crushing attacks whenever they're crits
See merge request veloren/veloren!3461
2022-07-06 21:38:41 +00:00
Socksonme
e3b1d02fce
Group up extra damage from crushing attacks whenever they're crits
2022-07-06 22:59:58 +03:00
Marcel Märtens
e4909650e1
update hashbrown, specs, and tracy
2022-07-06 15:41:59 +02:00
IsseW
6d8cbe6f0f
remove relative rain direction and increase FALL_RATE
2022-07-04 18:18:43 +02:00
IsseW
a7c724a46d
Limit figures drawn for rain occlusion
2022-07-04 18:18:35 +02:00
IsseW
27ec6d7469
add weather_zone command
2022-07-04 18:18:33 +02:00
IsseW
9f26afb4a5
refactor rain_dir to rain_vel
2022-07-04 18:11:45 +02:00
IsseW
121cf3becc
Comment fixes
2022-07-04 18:11:44 +02:00
Treeco
0d21361e05
Add player-relative rain direction
2022-07-04 18:11:42 +02:00
IsseW
fd12c8abdb
Remove dead shader code, clean up weather.rs
2022-07-04 18:10:06 +02:00
IsseW
6215ccd522
Remove dead code
2022-07-04 18:07:24 +02:00
IsseW
3eabe24f12
base occlusion texture size of off voxels
2022-07-04 18:07:19 +02:00
IsseW
08b0989789
add slider for rain map resolution
2022-07-04 18:07:18 +02:00
IsseW
54f958acc7
more correct occlusion
2022-07-04 18:07:16 +02:00
DaforLynx
aafd13508d
Completely redoing ambient sound again.
2022-07-04 18:07:08 +02:00
DaforLynx
16ca1410be
Remove extraneous sfx code
2022-07-04 18:07:08 +02:00
DaforLynx
ca815f25a1
merging some UI sfx from a now-dead branch
...
Merge part 2
merge part 3
Merge part 4
merge part 5
2022-07-04 18:07:07 +02:00
IsseW
4fa2644507
Interpolate weather in voxygen
2022-07-04 18:07:04 +02:00
IsseW
78c1de19cf
More accurate weather sim
2022-07-04 18:04:39 +02:00
IsseW
6585ef1513
weather dependant music
2022-07-04 18:11:43 +02:00
IsseW
b7c0196129
Server weather sim
2022-07-04 18:11:41 +02:00
Socksonme
6a355c58f2
Remove instance from PoiseChange
2022-06-29 18:36:05 +03:00
Socksonme
2c5fd06d0b
Address review
...
- Change hp_pulse to not be framerate dependent
- Change some of the HpFloater checks to be inside the find() function
- Remove unnecessary join
- Add back option for showing incoming damage + add option for
experience accumulation
- Change `ExpFloater`s to not store the owner, as they are only shown
for the player (will have to see if the implementation is correct so
that it may be applied to the other floaters)
- Rename `Outcome::Damage` to `Outcome::HealthChange` and `DamageInfo`
to `HealthChangeInfo`
- Update some outdated comments/documentation
2022-06-29 17:31:58 +03:00
socksonme
eabbfe6a51
Remove damage batch option + crit_mult
2022-06-29 17:31:54 +03:00
socksonme
0e84794217
change font size formula to not use crit_mult + use ints for change by check
2022-06-29 17:31:43 +03:00
socksonme
3d2dcbf894
Revert some changes
2022-06-29 17:31:43 +03:00
socksonme
559d5ca804
Some changes to DamageSources + various code qual changes
2022-06-29 17:31:43 +03:00
socksonme
5360a7c93e
Tons of code quality changes, added damage rounding option
2022-06-29 17:31:37 +03:00
socksonme
64f0f05608
Fixed bug with healing above 5.0 and preparing for options
2022-06-29 17:31:10 +03:00
socksonme
db16e6147c
Instance inside projectile constructor is now a variable
2022-06-29 17:31:09 +03:00
socksonme
202d558246
Instance number generated inside projectile constructor, remove crit field
2022-06-29 17:31:07 +03:00
socksonme
6c75ad6ef8
Code quality changes and comments
2022-06-29 17:30:54 +03:00
socksonme
c0e78d869e
Instance numbers are now based on the AttackDamage struct
2022-06-29 17:30:53 +03:00
socksonme
ac5bf53c42
Instance numbers for HpChanges
2022-06-29 17:30:50 +03:00
socksonme
f8924d6c1a
tweaks to damage floaters
...
Added some comments where stuff needs to be discussed
2022-06-29 17:30:32 +03:00
socksonme
7a1e19d42c
Crits now only glob with eachother, now show up like healing
...
Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later
2022-06-29 17:30:29 +03:00
socksonme
ce95680df9
Addressed comments, health and damage floaters are now separated
...
Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed
2022-06-29 17:29:59 +03:00
socksonme
94f193fbe0
Damage outcomes are now emitted with health change events
...
Being healed and damaged at the same time still leads to issues - needs to be sorted out
2022-06-29 17:29:19 +03:00
socksonme
634a3095d6
Handling crits (very bad color choice+naming)
2022-06-29 17:24:05 +03:00
socksonme
93d3ce18b4
Remove dbgs and temporary? 0.0 damage fix
2022-06-29 17:24:05 +03:00
socksonme
aee7888a92
HpFloaters are now created by Outcomes, touched up Damage Outcome
2022-06-29 17:24:05 +03:00
socksonme
bf6c6fb33d
Changed Damage Outcome to store more data
2022-06-29 17:24:05 +03:00
Sam
4a5ef6dce3
Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage.
...
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
2022-06-17 21:13:45 -04:00
Imbris
950723dd0d
Add metrics for counting server events
2022-06-15 00:40:58 -04:00
Samantha W
57ab1c5767
Add a client-side mutelist
2022-06-14 20:35:01 +00:00
IsseW
e05da7f6fa
fix depot bug
2022-06-09 09:53:06 +02:00
Christof Petig
a55cbbbf11
move the character_state test to the systems crate (where the infrastructure is complete)
2022-06-08 07:47:20 +02:00
Christof Petig
b702a27b28
different incomplete unit test attempts [ci skip]
2022-06-08 07:46:00 +02:00
Christof Petig
f8dd030643
remove dead code, test skeleton
2022-06-08 07:46:00 +02:00
Christof Petig
9c07f204a4
introduce a fast path for the common case of already horizontal ori and small rotation changes
2022-06-08 07:46:00 +02:00
Marcel Märtens
17661d9655
Revert "massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator"
...
This reverts commit 819dae754e
2022-06-07 22:57:40 +02:00
Marcel Märtens
819dae754e
massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator
...
do physics always after character_behavior as this one is saying how the input should be handled
2022-06-07 22:57:17 +02:00
Marcel Märtens
997b330f19
add physics tests that verify the status quo
2022-06-07 22:53:34 +02:00
terrarier2111
45efdb6602
Implement group owned loot
2022-06-04 17:16:12 +00:00
Christof Petig
59d876a654
pass humidity to meta, move smoke cycle to separate file
2022-06-01 22:13:34 +02:00
Maxwell
14d5b2e579
added all other types of chest sprites to check for non-explodable objects
2022-05-30 22:41:57 -05:00
Maxwell
a8892bab53
updated explode_power function to make chests non-explodable
2022-05-30 22:40:59 -05:00
Sam
5e57eabd11
Code changes and msm
2022-05-30 20:25:31 -04:00
N A
c09f070241
Change animal species to have only one inventory slot
2022-05-29 23:53:00 +00:00
Christof Petig
b8c3d71fbe
economy trace defaults to info
2022-05-29 19:08:39 +02:00
Benoît du Garreau
8488c7b25e
Upgrade assets_manager to 0.8.0 and image to 0.24
...
This removes a significant number of duplicated dependencies
2022-05-28 23:18:31 +02:00
Ben Wallis
34f580dfaa
Introduced loot ownership rules to combat loot stealing by players
...
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
2022-05-28 12:06:49 +00:00
Christof Petig
2bf8e1865f
Skiing and ice skating
2022-05-27 17:19:52 +00:00
Imbris
ca1a27bd11
Merge branch 'imbris/update-tracy' into 'master'
...
Update tracy
See merge request veloren/veloren!3400
2022-05-27 02:50:24 +00:00
Joshua Barretto
3b6e6be947
Merge branch 'zesterer/fix-climbing' into 'master'
...
Fixed climbing
See merge request veloren/veloren!3401
2022-05-26 09:34:10 +00:00
Joshua Barretto
4eb781cdf7
Fixed climbing
2022-05-26 10:08:41 +01:00
Imbris
a366fc4512
Update tracy
2022-05-26 00:04:03 -04:00
N A
d84a26dfd8
Special case taming and mounting.
2022-05-24 02:09:45 +00:00
Corvella
42af9b8e15
Hitbox improvements
2022-05-23 09:18:10 +00:00
Joshua Barretto
d18483756b
Fixed frozen character when wall-run into water horizontally
2022-05-22 19:37:52 +01:00
Sam
bbe22d6807
Fixed bins (no assets)
2022-05-18 16:44:09 -04:00
Sam
534c7dc8b9
Simplified item key (no assets)
2022-05-18 16:28:06 -04:00
Sam
72f38068e0
Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (no assets).
2022-05-16 15:11:44 -04:00
Sam
bcf36d08b0
Add removed items to migration.
2022-05-16 15:11:43 -04:00
Sam
54a6c31c63
Slight optimization to persistence
2022-05-16 15:11:42 -04:00
Sam
85c2a85817
Addressed review comments
2022-05-16 15:11:42 -04:00
Sam
00276acbdb
More feedback addressed (no assets).
2022-05-16 15:11:41 -04:00
Sam
5d0ba6e2b8
Addressed round 3 of feedback (no assets).
2022-05-16 15:11:41 -04:00
Sam
c0dd748bc7
Addressed second round of balance feedback (no assets).
2022-05-16 15:11:40 -04:00
Sam
95c3fdffa1
Addressed playtest feedback (no assets).
2022-05-16 15:11:39 -04:00
Sam
f47cbeb022
Addressed review comments
2022-05-16 15:11:38 -04:00
Sam
de8f98446e
Fixed errors in csv import, csv export, and recipe graphviz bins
2022-05-16 15:11:37 -04:00
Sam
528b62c59a
Rebase commit
2022-05-16 15:11:36 -04:00
Sam
64d07d02c4
Changed item definition id to better handle modular items.
2022-05-16 15:11:34 -04:00
Sam
37442b638c
Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets).
2022-05-16 15:11:33 -04:00
Sam
afd2c8730f
Addressed most review comments (no assets).
2022-05-16 15:11:32 -04:00
Sam
816c265662
Rebase stuffs
2022-05-16 15:11:26 -04:00
Sam
fceb48c3ac
Removed vec allocation for component recipe iterators
2022-05-16 15:11:26 -04:00
Sam
a5a517916e
Initial UI including ingredients in crafting modular components
2022-05-16 15:11:25 -04:00
Sam
085b18c07a
Formatting tweaks to tooltips
2022-05-16 15:11:25 -04:00
Bryant Deters
075fee5190
modular component tooltips
2022-05-16 15:11:25 -04:00
Sam
e69aa8c4ee
Fixed items with components having incorrect hashes
2022-05-16 15:11:24 -04:00
Sam
6fa7852a8c
Fixed random generation of modular weapons.
2022-05-16 15:11:23 -04:00
Sam
e86d2ab46a
Fixed rebase
2022-05-16 15:11:22 -04:00
Sam
cb04433c14
Fix rebase
2022-05-16 15:11:22 -04:00
Sam
d436362a8d
Consolidated crafting UI for the primnary component of modular weapons.
2022-05-16 15:11:21 -04:00
Sam
5877334ed3
Tags are now generated for modular items.
2022-05-16 15:11:20 -04:00
Sam
ef5b2e4a1e
Added method of differing names for 1h and 2h variants of a modular wepaon.
...
Added all 1h melee weapon models.
2022-05-16 15:11:19 -04:00
Sam
af50864643
Fixed issue in updating item config when loading persisted items.
2022-05-16 15:11:18 -04:00
Sam
bf348b7f43
Addressed further review.
2022-05-16 15:11:16 -04:00
