Christof Petig
|
b3956517fc
|
suppress recipes with no cost
|
2021-06-08 09:17:04 +02:00 |
|
jshipsey
|
fe1cbec37c
|
various fixes to items
|
2021-06-07 21:21:12 -04:00 |
|
Marcel Märtens
|
7185dcee68
|
switch to hashbrown 0.11 and specs 0.16.2
|
2021-06-07 13:01:01 +02:00 |
|
Marcel
|
f2eedf81f4
|
Merge branch 'imbris/648-cleanup' into 'master'
Make handling of shortcut keywords for commands clearer and revise a TODO...
Closes #648
See merge request veloren/veloren!2387
|
2021-06-07 10:27:54 +00:00 |
|
Marcel Märtens
|
b1c2a1bde0
|
put ron behind a cargo feature as its only used in a bin and fix a logical merge conflict, overwriting with edfe713076
|
2021-06-07 11:13:55 +02:00 |
|
Sam
|
0488b2fcd0
|
Adressed comments on energy and armor functions.
|
2021-06-07 11:06:25 +02:00 |
|
Snowram
|
76ca99ece4
|
Derive str from Material, better deserialization
|
2021-06-07 11:03:50 +02:00 |
|
jshipsey
|
4deeb42155
|
cave adjustments
|
2021-06-07 11:02:34 +02:00 |
|
jshipsey
|
9034d0f25d
|
comment addressing, cave tweaks
|
2021-06-07 11:01:46 +02:00 |
|
jshipsey
|
0e269b59d7
|
tooltip work
|
2021-06-07 11:01:32 +02:00 |
|
Snowram
|
29a38e6d4f
|
Split tags into material class and material
|
2021-06-07 11:00:57 +02:00 |
|
Snowram
|
3fa7d0b6d4
|
Add material and armor class tags
|
2021-06-07 11:00:31 +02:00 |
|
jshipsey
|
7a573efab7
|
proper recipes, tanning racks, various fixes
|
2021-06-07 11:00:14 +02:00 |
|
jshipsey
|
05de96c94b
|
ore deposits, flower drops
|
2021-06-07 10:59:50 +02:00 |
|
jshipsey
|
1c17d8fe5e
|
cave changes
|
2021-06-07 10:59:44 +02:00 |
|
jshipsey
|
754b60d810
|
crafting stations
|
2021-06-07 10:59:35 +02:00 |
|
Sam
|
2a07fad802
|
Removed armor stat hackery.
Added new armor stats to remaining armor items.
Fixed broken tests.
|
2021-06-07 10:59:26 +02:00 |
|
Sam
|
fa0fe38699
|
Fixed csv tools
|
2021-06-07 10:58:47 +02:00 |
|
Sam
|
855384fbeb
|
Crit power stat now functional, added comments on each stat field to better describe what the stat does and what values should be used.
|
2021-06-07 10:58:42 +02:00 |
|
Sam
|
c3b834ec15
|
Max energy stat functional.
|
2021-06-07 10:58:37 +02:00 |
|
Sam
|
6790b71d53
|
Energy recovery stat functional.
|
2021-06-07 10:58:32 +02:00 |
|
jshipsey
|
1b575a5a04
|
crafting item partial re-organization, armor recipes, some specific animal drops
|
2021-06-07 10:56:35 +02:00 |
|
Marcel
|
27e505e79d
|
Merge branch 'xMAC94x/log_spam' into 'master'
XMAC94x/log spam
See merge request veloren/veloren!2385
|
2021-06-07 07:55:27 +00:00 |
|
Imbris
|
0b92c72096
|
Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes
|
2021-06-06 23:45:51 -04:00 |
|
Marcel Märtens
|
26160df8e5
|
adjust tracing
|
2021-06-06 19:31:25 +02:00 |
|
Marcel
|
521e1eacf3
|
Merge branch 'aweinstock/add-models-20210603' into 'master'
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
See merge request veloren/veloren!2371
|
2021-06-06 16:56:21 +00:00 |
|
Snowram
|
edfe713076
|
Cyclops, basilisk, air balloon offsets
|
2021-06-06 14:12:08 +02:00 |
|
Sam
|
acf7ad27f1
|
Balance tweaks.
|
2021-06-05 17:15:04 -05:00 |
|
Sam
|
74b7039219
|
Yeti AI
|
2021-06-05 13:25:47 -05:00 |
|
Sam
|
93f90d514c
|
Particles for ice spikes
|
2021-06-04 18:17:15 -05:00 |
|
Sam
|
81f7e690fd
|
Snowball attack.
|
2021-06-04 18:17:15 -05:00 |
|
Sam
|
a82984b925
|
Added base ability set
|
2021-06-04 18:17:14 -05:00 |
|
Sam
|
eaf87a53bb
|
Final tweaks.
|
2021-06-03 21:39:47 -05:00 |
|
Sam
|
5bf99eac11
|
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
|
2021-06-03 21:39:15 -05:00 |
|
Sam
|
ac2f097d80
|
Tidal warrior AI.
|
2021-06-03 21:39:14 -05:00 |
|
Sam
|
c81e1534f7
|
First 3 abilities for tidal warrior functional. Added bubble particles.
|
2021-06-03 21:39:13 -05:00 |
|
Avi Weinstock
|
05c699878f
|
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
|
2021-06-03 19:24:34 -04:00 |
|
Marcel Märtens
|
affb9730a8
|
use criterion groups and fix tracing to much on wgpu
|
2021-06-03 22:37:17 +02:00 |
|
Imbris
|
7da6b5e59d
|
Fix ProfSpan constructor being private
|
2021-06-03 00:10:06 -04:00 |
|
Imbris
|
c2da81cf18
|
Move pipeline creation into the background, still needs Drawer modications and UI to display status
|
2021-06-02 23:59:51 -04:00 |
|
Imbris
|
a1fac487e4
|
Suppress wgpu_core::device info logging
|
2021-06-02 23:59:48 -04:00 |
|
Samuel Keiffer
|
4b359b8ca4
|
Merge branch 'aweinstock/price-equality' into 'master'
Add a manifest for making different items count as the same item for the purpose of pricing.
See merge request veloren/veloren!2360
|
2021-06-02 23:48:45 +00:00 |
|
Samuel Keiffer
|
9a31d77f0a
|
Merge branch 'tygyh/default-loadout' into 'master'
LoadoutBuilder refactoring
See merge request veloren/veloren!2361
|
2021-06-02 23:42:39 +00:00 |
|
Samuel Keiffer
|
d235e98efe
|
Merge branch 'aweinstock/agent-pid' into 'master'
Implement PID controllers and use them to stabilize Agent airship flight.
See merge request veloren/veloren!2356
|
2021-06-02 23:15:08 +00:00 |
|
Avi Weinstock
|
054fb1d763
|
Add a manifest for making different items count as the same item for the purpose of pricing.
|
2021-06-02 19:12:51 -04:00 |
|
juliancoffee
|
1fc3fce970
|
Move warning-supressing from global onto function
|
2021-06-03 01:58:34 +03:00 |
|
juliancoffee
|
00714db492
|
Implement Choice of Choice in loadout files
|
2021-06-02 18:35:22 +03:00 |
|
juliancoffee
|
674a7f41bd
|
Using clippy::pedantic and improve asset tests
- Turned clippy::pedantic on for loadout_builder.rs and applied some
proposition
- Check for invalid weights in loadout files
|
2021-06-02 17:54:14 +03:00 |
|
Marcel
|
f988584337
|
Merge branch 'revert-c6e200a3' into 'master'
Add a configuration Option to opt-in Quic backend
See merge request veloren/veloren!2318
|
2021-06-02 14:27:13 +00:00 |
|
juliancoffee
|
952156ad99
|
Add ability to override weapon in loadout assets
|
2021-06-02 17:17:19 +03:00 |
|