Joshua Yanovski
bc4600cf14
Rivers (hack, not great).
2022-07-25 18:28:27 -07:00
Joshua Yanovski
6eb26ba6d8
Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen
2022-07-07 16:02:18 -07:00
Marcel Märtens
e4909650e1
update hashbrown, specs, and tracy
2022-07-06 15:41:59 +02:00
IsseW
5a0cdc2528
add rain threshold that depends on chunk moisture
2022-07-04 18:18:43 +02:00
IsseW
80e29e2c20
put rain_density in uniform
2022-07-04 18:18:37 +02:00
IsseW
27ec6d7469
add weather_zone command
2022-07-04 18:18:33 +02:00
IsseW
121cf3becc
Comment fixes
2022-07-04 18:11:44 +02:00
IsseW
fd12c8abdb
Remove dead shader code, clean up weather.rs
2022-07-04 18:10:06 +02:00
DaforLynx
dc8424c549
Moving audio code
2022-07-04 18:10:05 +02:00
IsseW
6215ccd522
Remove dead code
2022-07-04 18:07:24 +02:00
IsseW
b82bb5b247
Don't have rain be behind an expiremental shader
2022-07-04 18:07:22 +02:00
IsseW
3eabe24f12
base occlusion texture size of off voxels
2022-07-04 18:07:19 +02:00
IsseW
6d40caed23
wind adjust
2022-07-04 18:07:17 +02:00
IsseW
54f958acc7
more correct occlusion
2022-07-04 18:07:16 +02:00
DaforLynx
83ee54001e
Ambience slider; fix to utterances
2022-07-04 18:07:15 +02:00
IsseW
79cac935c8
Added rain occlusion
2022-07-04 18:07:11 +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
Joshua Barretto
48117988e1
Better rain threshold
2022-07-04 18:07:06 +02:00
Joshua Barretto
767093105f
Rebalanced rain
2022-07-04 18:07:05 +02:00
Joshua Barretto
502145a6f9
Cloud movement is more prominent
2022-07-04 18:07:01 +02:00
Joshua Barretto
dc90d637c1
Smoother clouds
2022-07-04 18:07:01 +02:00
IsseW
273c5ed2f0
Temporary noise solution
2022-07-04 18:07:00 +02:00
IsseW
9c84a20cef
better sim
2022-07-04 18:06:58 +02:00
IsseW
0c804af773
reasonable delta time
2022-07-04 18:06:58 +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
Marcel Märtens
50d85940d8
implement a event channel that posts regular information on events for Participants
2022-07-03 21:21:59 +02:00
Joshua Yanovski
957467e114
Fix chunk noise.
2022-07-01 23:57:09 -07:00
Joshua Yanovski
59aacc3fd8
Remove some bottlenecks.
2022-07-01 20:41:59 -07:00
Samuel Keiffer
0bd08b1f9e
Merge branch 'socksonme/rework_sct' into 'master'
...
Rework SCT
See merge request veloren/veloren!3126
2022-07-02 02:42:42 +00:00
Joshua Yanovski
ad5bcf3cd8
Turning "full" chunks back on, deserialization improvements.
2022-06-29 21:52:04 -07:00
James Melkonian
8439f3ef6d
Wiring System Documentation and Refactoring
2022-06-29 20:28:09 +00:00
Socksonme
6a355c58f2
Remove instance from PoiseChange
2022-06-29 18:36:05 +03:00
Socksonme
f048600335
Add back old i18n + some small fixes
...
- Fix .filter() for combo_floater
- Rename sct_inc_dmg_accum_duration to sct_inc_dmg, as it was in the
wrong place
to rebase
2022-06-29 17:31:58 +03:00
Socksonme
f6189a61f2
Address review - addendum
...
- `BlockFloater`s and `ComboFloater`s don't store the owner anymore,
`ExpFloater` still does, however the field is used to prevent
accumulating old floaters with new ones. This change also makes it so
that if the client changes entity, they keep the old entity's
floaters.
- The `combo_floaters` field is now `combo_floater` plus it now uses an
Option<ExpFloater>.
- Changed `handle_health_change` to change the health even if the entity
does not have a `Pos` or `Uid`, now uses `emit_now`combo_floater` plus
it now uses an Option<ExpFloater>.
- Changed `handle_health_change` to change the health even if the entity
does not have a `Pos` or `Uid`, now uses `emit_now`
- Changed some comments
2022-06-29 17:31:58 +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
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
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
