Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,757 Commits 151 Branches 18 Tags
Commit Graph

8757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
c0fec35f7a Merge branch 'dungeon_voxel_export' into 'master' 
Add dungeon shape to MagicaVoxel export example

See merge request veloren/veloren!2412
 2021-06-14 15:07:25 +00:00
Marcel
6225666050 Merge branch 'aweinstock/forcemove-no-pushback' into 'master' 
Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429
 2021-06-14 14:42:01 +00:00
Marcel
27e0b17651 Merge branch 'aweinstock/mining-skill-tree' into 'master' 
Mining skill tree.

See merge request veloren/veloren!2406
 2021-06-14 14:19:06 +00:00
Marcel
f41bedc02c Merge branch 'juliancoffee/asset_entity' into 'master' 
EntityInfo assetization.

See merge request veloren/veloren!2382
 2021-06-14 12:56:28 +00:00
Vincent Junge
f724123694 Added dungeon shape to MagicaVoxel export example 2021-06-14 14:43:00 +02:00
juliancoffee
ec6bcea8f1 Responding to review 
- make `skillset_builder::Preset` void enum and left comment about how to
extend it
- add `.with_default_equipment()` in case if preset is missing to `basic_summon`
loadout creation to match old `build_loadout()` behaviour
 2021-06-14 15:40:02 +03:00
Avi Weinstock
37730a0993 Move force-movement e2e check so that it doesn't confer immunity to arrows. 2021-06-13 20:38:03 -04:00
Marcel
76b12eb93d Merge branch 'Veloren_Kisa-master-patch-51169' into 'master' 
Не полный перевод навыков, исправлены оригинальные описания и названия.

See merge request veloren/veloren!2432
 2021-06-13 21:55:57 +00:00
Marcel
e8d0e8a222 Merge branch 'Veloren_Kisa-master-patch-14791' into 'master' 
Полный перевод на русский язык

See merge request veloren/veloren!2434
 2021-06-13 21:55:55 +00:00
Marcel
78ba8cd34d Merge branch 'Veloren_Kisa-master-patch-17326' into 'master' 
Upload New File

See merge request veloren/veloren!2435
 2021-06-13 21:55:53 +00:00
Monty Marz
0d8db1b417 Merge branch 'pfau/cactus_drink' into 'master' 
Cactus Colada

See merge request veloren/veloren!2431
 2021-06-13 20:03:58 +00:00
Avi Weinstock
4f8fa1fb6d Move changelog entry for mining to 0.10 section. 2021-06-13 14:35:44 -04:00
Monty Marz
8466df5078 mining exp sct color and icon; add mining to skill_preset 2021-06-13 14:34:42 -04:00
Avi Weinstock
4bd989e2a5 Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. 2021-06-13 14:34:42 -04:00
Monty Marz
c34fa59a08 icons and naming 2021-06-13 14:34:42 -04:00
Avi Weinstock
ef3d5f36d5 Address MR 2406 comments. 
- Tweak ore xp values per Slipped's advice.
 2021-06-13 14:34:42 -04:00
Avi Weinstock
667e5eb510 Mining skill tree. 2021-06-13 14:34:42 -04:00
Marcel
bf1114bd7d Merge branch 'yusdacra/chore/nix' into 'master' 
build(nix): fix nix builds

See merge request veloren/veloren!2437
 2021-06-13 17:11:52 +00:00
Yusuf Bera Ertan
2503e8f736
build(nix): switch back to master branch nix-cargo-integration, use defaultOutputs 2021-06-13 19:33:38 +03:00
Yusuf Bera Ertan
02e3dcaded
build(nix): dont try to compile the recipe_graphviz binary 2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
1f0616f05b
build(nix): dont try to compile i18n-check binary 2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
33c9972952
build(nix): fix shaderc lib 2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
b8885202dd
chore(deps): update nix flake deps 2021-06-13 19:29:28 +03:00
Marcel
1c582e1f5c Merge branch 'xMAC94x/flakytests' into 'master' 
redo slowjobs, fixed #1056

Closes #1056

See merge request veloren/veloren!2063
 2021-06-13 16:10:09 +00:00
Marcel Märtens
e7b587eaa2 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
c8262f5bec redo slowjobs in order to have a try_run fn 2021-06-13 17:42:21 +02:00
Marcel Märtens
9506aacdbc make test less flanky, try to avoid absolute comparisions and compare jobs relative. 2021-06-13 17:31:34 +02:00
K. Kisa
b744631662 Upload New File 2021-06-13 13:30:42 +00:00
K. Kisa
e8b3dbf72d Полный перевод на русский язык 2021-06-13 13:24:57 +00:00
K. Kisa
1895ef1939 Не полный перевод навыков, исправлены оригинальные описания и названия. 2021-06-13 13:08:52 +00:00
Monty
fe86ef1e96 Cactus Colada 
Made cacti lootable
Cactus colada recipe and item
price balance
fmt

 "make it 8 and drop it to 20 or 25? Not really sure tbh"
 2021-06-13 13:52:56 +02:00
Marcel
b9347332ed Merge branch 'juliancoffee/item_price_split_consumables' into 'master' 
Split consumables to different tables in trading

See merge request veloren/veloren!2415
 2021-06-13 11:29:47 +00:00
Marcel
137950330d Merge branch 'xvar/fix-backpack-swap' into 'master' 
Fixed crash when swapping an equipped item with slots for an item with no slots

See merge request veloren/veloren!2430
 2021-06-13 11:16:03 +00:00
Ben Wallis
d54e7435df Improved inventory swap 2021-06-12 19:06:39 +01:00
Avi Weinstock
c97797a87c Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04:00
juliancoffee
b5e1911930 Introduce hit_timing for combo_melee 
bonus: speeding up first swing of sword from 0.15 to 0.1 and reducing
poise damage of hammer from 25 to 20
 2021-06-12 14:10:19 +03:00
Marcel
840a093317 Merge branch 'xMAC94x/release_numbers' into 'master' 
Change the version number to 0.10

See merge request veloren/veloren!2428
 2021-06-12 08:55:34 +00:00
Marcel Märtens
d291a71f79 Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Forest Anderson
f8dae445aa Merge branch 'juliancoffee/small_fixes' into 'master' 
Ranged, Tidal Warrior, spears, assets

See merge request veloren/veloren!2416
 2021-06-11 17:46:56 +00:00
juliancoffee
d122c2e9cb revert bow to almost master values 2021-06-11 17:20:46 +03:00
juliancoffee
44cda79992 Nerf recover duration for animal dashes 2021-06-11 16:18:59 +03:00
juliancoffee
60068f161d Make bow more snipy 2021-06-11 15:56:16 +03:00
juliancoffee
9a8ae64f4c adjust staff firebomb 2021-06-11 15:41:38 +03:00
Marcel
8686f9c15e Merge branch 'merryck.wales-master-patch-32631' into 'master' 
Fix incorrect tooltip on Staff Damage skill - Update diary.rs

See merge request veloren/veloren!2421
 2021-06-11 11:59:10 +00:00
Cr0ss0vr
351d206598 Fix incorrect tooltip on Staff Damage skill - Update diary.rs 2021-06-11 11:59:09 +00:00
juliancoffee
71e5c25aac remove meaningless variables 2021-06-11 11:44:48 +03:00
Marcel
cbe53d1c81 Merge branch 'zesterer/small-fixes' into 'master' 
Repaired common such that it works for plugin targets

See merge request veloren/veloren!2422
 2021-06-11 08:32:55 +00:00
Marcel
cec2191df2 Merge branch 'xMAC94x/fix_tracy' into 'master' 
fix tracy-server compilation via cargo tracy-server

See merge request veloren/veloren!2409
 2021-06-11 08:32:53 +00:00
Marcel
68cda3ea1c Merge branch 'slippedfix' into 'master' 
Update simple_leather.ron

See merge request veloren/veloren!2419
 2021-06-11 08:32:50 +00:00
Justin Shipsey
01379ca6dc Update simple_leather.ron 2021-06-11 08:32:49 +00:00