Marcel Märtens
|
34f5ff62d4
|
implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling
|
2021-06-13 17:42:28 +02:00 |
|
Marcel Märtens
|
e2a9128976
|
redo slowjobs in order to have a try_run fn
|
2021-06-13 17:42:21 +02:00 |
|
Marcel Märtens
|
5f2b44002e
|
make test less flanky, try to avoid absolute comparisions and compare jobs relative.
|
2021-06-13 17:31:34 +02:00 |
|
Ben Wallis
|
f47838ee9d
|
Improved inventory swap
|
2021-06-12 19:06:39 +01:00 |
|
Joshua Barretto
|
1b1287f407
|
Repaired common such that it works for plugin targets
|
2021-06-11 08:33:32 +01:00 |
|
Scott Williams
|
f336b0e2a8
|
Fixed biped_small and humanoid hitboxes
|
2021-06-09 15:23:10 +01:00 |
|
Marcel
|
875b26a93a
|
Merge branch 'aweinstock/recipe-graphviz' into 'master'
Add graphviz diagram generator for crafting recipes.
See merge request veloren/veloren!2401
|
2021-06-09 09:14:13 +00:00 |
|
Scott Williams
|
2a161abd0a
|
NPC Hitbox Adjustments
|
2021-06-09 08:08:41 +00:00 |
|
Avi Weinstock
|
b5ae6227c0
|
Run clippy for graphviz target in CI and add instructions on how to consume the output.
|
2021-06-08 15:08:14 -04:00 |
|
Avi Weinstock
|
b5b7de9532
|
Add graphviz diagram generator for crafting recipes.
|
2021-06-08 14:42:51 -04:00 |
|
Marcel Märtens
|
37c508d05d
|
add todo for clippy exception
|
2021-06-08 15:45:46 +02:00 |
|
Marcel
|
39ea9d3aa3
|
Merge branch 'xMAC94x/ci_bin_features' into 'master'
Add bot tests to CI
See merge request veloren/veloren!2326
|
2021-06-08 10:04:17 +00:00 |
|
Marcel
|
eecb561838
|
Merge branch 'slipped/meatfollowup' into 'master'
various fixes to items
See merge request veloren/veloren!2399
|
2021-06-08 09:57:31 +00:00 |
|
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 |
|
Avi Weinstock
|
3cbf84ddb1
|
Restore collision data for airships, and add the test that would have caught this.
|
2021-06-07 18:09:09 -04:00 |
|
Marcel Märtens
|
846df3a18a
|
--all-targets does not run targets that needs some features which are not provided. --all-features is NOT possible as we have some features which are conflicting.
The only possibility is to manually add the features we need to check in CI to the clippy query
|
2021-06-07 12:29:08 +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 |
|
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
|
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 |
|
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 |
|