Sam
c44c10718b
Split skillset and skills into separate files.
2022-01-03 19:55:00 -05:00
Sam
fe45a158ed
Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp.
2022-01-03 19:55:00 -05:00
DaforLynx
13e87375d6
River sounds and more
2022-01-03 22:40:31 +00:00
Samuel Keiffer
4d85ae4f60
Merge branch 'ubruntu/dagger-ux' into 'master'
...
Dagger UX
See merge request veloren/veloren!3072
2021-12-28 22:09:34 +00:00
ubruntu
65f9d18fb7
Dagger UX
2021-12-28 22:09:34 +00:00
DoctorKompot
0dba858ca9
fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files
2021-12-27 03:01:26 +02:00
DoctorKompot
1cc69bbca1
fixed Pfau's turbans and manually added back mod.rs files that got deleted previously
2021-12-27 03:01:19 +02:00
DoctorKompot
9eedb024fe
added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry
2021-12-27 03:01:18 +02:00
DoctorKompot
ccc1bdbf1c
updated the Common Quality item displays
2021-12-27 03:00:57 +02:00
Imbris
bf48bd5346
update toolchain to nightly-2021-12-19
2021-12-23 13:04:24 +01:00
DaforLynx
e44478736e
Music additions
2021-12-22 11:20:34 +00:00
Christof Petig
453c4c149e
fix more examples and satisfy code quality checks
2021-12-20 18:09:34 +00:00
Joshua Barretto
3b4fa6b328
Snow for ice
2021-12-20 18:06:53 +00:00
Joshua Barretto
6e97e3179d
Slippery ice
2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3
Merge branch 'Character-editting' into 'master'
...
Character editing
See merge request veloren/veloren!3059
2021-12-20 15:24:43 +00:00
ubruntu
59cb9ea7c2
Hide empty stats on item tooltips
2021-12-20 15:07:38 +00:00
Snowram
66a5f9fded
Fixes animation hot reloading (credit to Imbris)
2021-12-18 20:36:14 +01:00
Dr. Dystopia
1719ce8c16
Format
2021-12-18 15:58:17 +01:00
IsseW
65ab92eb78
button spacing
2021-12-18 15:41:11 +01:00
Dr. Dystopia
3329a8df61
Add 'pen' icons for edit buttons
2021-12-18 15:27:14 +01:00
Dr. Dystopia
9a7cc50898
Show current equipment during editing
2021-12-18 12:35:31 +01:00
Dr. Dystopia
48fd9e877d
Use 'confirm' button when finishing editing
2021-12-18 11:45:49 +01:00
Dr. Dystopia
62f9bc5059
Fix redundant pattern matching
2021-12-15 21:05:49 +01:00
Dr. Dystopia
e2f4499d45
Remove debug prints
2021-12-15 20:56:44 +01:00
IsseW
8b258e4e81
Non editable data
2021-12-15 20:40:01 +01:00
Joshua Barretto
dd95d69dc4
Fixed character editing
2021-12-13 00:55:25 +00:00
Dr. Dystopia
408fe1e6b6
Begin creating character editing
2021-12-13 01:13:33 +01:00
Benoît du Garreau
aca088388b
Update assets_manager to 0.7
2021-12-12 22:11:47 +01:00
James Melkonian
5f6d1c3438
Convert Armor Stats to Options
2021-12-12 00:25:35 +00:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Dr. Dystopia
f4c5abf36b
Resolve all '#[allow(clippy::needless_range_loop)]' error supressions
2021-12-03 10:38:30 +01:00
Dr. Dystopia
a0dfb2e8ad
Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions
2021-11-30 13:57:47 +01:00
Avi Weinstock
cb4c3eb34e
Bodies of water no longer contain black chunks on the voxel minimap.
...
The heuristic for pruning dungeon ceilings depended on detecting an
air-to-not-air edge, which was not present for chunks whose topmost
layer was water. Sampling 1 layer of the `above` block introduces such
an edge, allowing the water surface to be detected.
2021-11-29 14:39:56 -05:00
Jonathan Berglin
d9dd49552b
Tygyh/resolve all '# allow(clippy needless update)]' error supressions
2021-11-29 09:32:55 +00:00
Imbris
7760210824
Remove redundant closures
2021-11-28 12:24:57 -05:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +01:00
Imbris
0beee17370
Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version
2021-11-21 09:51:39 -05:00
Marcel Märtens
7a8944ac71
remove additional restriction which is only necessary in egui 0.15
2021-11-20 20:22:45 +01:00
Marcel Märtens
7200cc4ad7
undo egui upgrade try
2021-11-20 20:18:03 +01:00
Marcel Märtens
e29ede7c97
updating dependencies,
...
cannot update the following dependencies:
- vek: Sharps SIMD isnt upstream
- tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
- refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
- equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
- wgpu: cant update due new version doesnt support DX11
Got quinn updated which now require some dependencies to be explicit.
2021-11-20 20:17:49 +01:00
Marcel Märtens
086f9737e4
move server.voxel for airship to common
2021-11-15 16:39:39 +01:00
Joshua Barretto
b1915622b5
Merge branch 'xvar/fix-tooltip-floating-point-rounding' into 'master'
...
Added formatting to round tooltip values for consumables to 1 decimal place
See merge request veloren/veloren!3004
2021-11-13 20:54:05 +00:00
Ben Wallis
022c1417b6
EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies).
...
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.
EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
2021-11-13 20:46:45 +00:00
Ben Wallis
b4c7af1ad1
Added formatting to round tooltip values for consumables to 1 decimal place
2021-11-13 20:25:09 +00:00
Joshua Barretto
c0bf9503bd
Addressed review issues, added cloning docs to BodySpec::Manifests
2021-11-13 17:20:23 +00:00
Joshua Barretto
657ac45288
Updated changelog
2021-11-13 17:13:09 +00:00
Joshua Barretto
46ec4203a2
Arbitrary volume airships
2021-11-13 17:13:08 +00:00
Samuel Keiffer
6e57380735
Merge branch 'sam/ability-pool-and-hotbar' into 'master'
...
Ability pool
See merge request veloren/veloren!2996
2021-11-12 05:11:12 +00:00
Sam
b901b97191
Changed fallback ability icon.
2021-11-11 23:41:01 -05:00
Sam
040d70c750
Final fixes.
2021-11-11 23:11:17 -05:00
