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,292 Commits 151 Branches 18 Tags 2.1 GiB
3a1a65b134
Commit Graph

8292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
juliancoffee
5e598964b1 Downgrade git2 to compile on windows 2021-05-10 00:09:33 +03:00
Joshua Yanovski
7ee2d9dfa3 Merge branch 'juliancoffee/improve_spawn_cmd_ux' into 'master' 
improve /spawn cmd UX

See merge request veloren/veloren!2283
 2021-05-09 20:22:29 +00:00
juliancoffee
2881034426 update CHANGELOG 2021-05-09 20:43:13 +03:00
juliancoffee
d3be89f5eb Add species to /spawn auto-complete 2021-05-09 20:43:13 +03:00
Benoît du Garreau
2718fdb1ca Only load images as PNG 2021-05-09 19:02:48 +02:00
Marcel
587b48871d Merge branch 'juliancoffee/decouple_localization_checks' into 'master' 
Extract voxygen/src/i18n.rs  to crate

See merge request veloren/veloren!2244
 2021-05-09 16:47:25 +00:00
juliancoffee
3d011098b8 style convention 2021-05-09 19:05:01 +03:00
juliancoffee
2035c041f9 add authors 2021-05-09 13:12:26 +03:00
juliancoffee
359a46d6f2 Fix tests 
1) Use more correct way to look for `assets` dir
2) Rename veloren_common::assets to veloren_common_assets in doc-tests
 2021-05-09 13:12:26 +03:00
juliancoffee
9af0b6dd12 Search for assets in workspace root 2021-05-09 13:12:26 +03:00
juliancoffee
279d57658d Fix paths and adding tests 2021-05-09 13:12:26 +03:00
juliancoffee
0a63b10f4c rename i18n/src/i18n.rs to i18n/src/data.rs 2021-05-09 13:12:26 +03:00
juliancoffee
735e8ab4ec Extract common/src/assets.rs to own crate 
This gives us ability to use assets-related code in i18n without
depending on whole veloren-common
 2021-05-09 13:12:26 +03:00
juliancoffee
0784c2a76a Make fields more private 2021-05-09 13:12:26 +03:00
juliancoffee
c511028290 remove unneeded imports 2021-05-09 13:12:26 +03:00
juliancoffee
911bf974f3 Use hashbrown 2021-05-09 13:12:26 +03:00
juliancoffee
89b6111064 Remove unused dependencies 2021-05-09 13:12:26 +03:00
juliancoffee
5573fc33b9 Extract voxygen/src/i18n.rs into own crate 
- New crate (i18n), currently under voxygen directory
- Updated CI to run localization test from i18n, not from voxygen
 2021-05-09 13:12:26 +03:00
juliancoffee
50e992ed0d use hashbrown instead of std::collections 2021-05-09 13:12:26 +03:00
juliancoffee
622101d3b1 Update instuction for using binary 2021-05-09 13:12:26 +03:00
juliancoffee
fd387bda7c Add comments 2021-05-09 13:12:25 +03:00
juliancoffee
5f32b37768 Integrate verification from i18n_check 2021-05-09 13:12:25 +03:00
juliancoffee
f42e8aa147 Integrate changes and improving code style 
- Integrate voxygen/i18n-check to voxygnen/src/i18n.rs
- Make `cargo clippy` happy
 2021-05-09 13:12:25 +03:00
juliancoffee
57cddb3ee3 Extract localization test to binary 
- Implement `--all` option
- Implement `--lang <code>` option
- Implement `--verify` command
 2021-05-09 13:12:25 +03:00
Monty Marz
9f0ca486f7 Merge branch 'aweinstock/small-fixes' into 'master' 
Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE.

See merge request veloren/veloren!2277
 2021-05-09 09:58:44 +00:00
Monty Marz
335b4c5420 Merge branch 'pfau/tiny_ui_fix' into 'master' 
Better inactive/active audio slider logic

See merge request veloren/veloren!2278
 2021-05-09 09:51:42 +00:00
Monty Marz
a17bb0ad73 Better inactive/active audio slider logic 2021-05-09 09:51:41 +00:00
Avi Weinstock
0f424ec95a Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE. 2021-05-08 17:49:51 -04:00
Marcel
eb3cc2fd22 Merge branch 'aweinstock/heightmap_visualization' into 'master' 
Add heightmap visualization to world/examples.

See merge request veloren/veloren!2246
 2021-05-08 16:02:11 +00:00
Marcel
2ea69a6180 Merge branch 'aweinstock/fix-bow-20210507' into 'master' 
Make projectiles function properly if they hit a wall in the same tick as an entity.

See merge request veloren/veloren!2275
 2021-05-08 15:47:12 +00:00
Marcel
39843860fb Merge branch 'juliancoffee/preset_cmd' into 'master' 
/skill_preset command

See merge request veloren/veloren!2274
 2021-05-08 15:47:10 +00:00
Illia Denysenko
1c22a2b3fd /skill_preset command 2021-05-08 15:47:09 +00:00
Avi Weinstock
560c58663e Add max-convolution to heightmap visualization, and specify required-features for it to make CI work. 2021-05-08 11:19:37 -04:00
Avi Weinstock
7ec7540be4 Make projectiles function properly if they hit a wall in the same tick as an entity. 2021-05-07 23:20:57 -04:00
Adam Strauss
a5b7e34bf8 Fix #1105: Move server event so it does not emit constantly during build up 2021-05-07 15:40:11 -07:00
Adam Strauss
3d17fde537 Implement #1105: Rolling removes burning debuff 2021-05-07 15:38:41 -07:00
Snowram
ad3a63fc80 Merge branch 'snowram/craftmats-ron-fix' into 'master' 
Fixes object manifest

See merge request veloren/veloren!2273
 2021-05-07 21:06:37 +00:00
Samuel Keiffer
b6df12040a Merge branch 'update_pt_BR_20210507' into 'master' 
Update pt br 20210507

See merge request veloren/veloren!2272
 2021-05-07 20:07:16 +00:00
Nícolas Wildner
f517b06d50 Update pt br 20210507 2021-05-07 20:07:14 +00:00
Samuel Keiffer
1f49775aee Merge branch 'aweinstock/tradeuifixes-20210506' into 'master' 
Add red-orange pulsing "Nothing!" to the second phase of an a 0-quantity...

See merge request veloren/veloren!2265
 2021-05-07 20:07:12 +00:00
Snowram
ec3fa365d0 Fixes object manifest 2021-05-07 22:04:57 +02:00
Avi Weinstock
76da18da3c Add red-orange pulsing "Nothing!" to the second phase of an a 0-quantity trade, and improve the distance merchants are visible at. 2021-05-07 15:24:55 -04:00
Justin Shipsey
f552a71d68 Merge branch 'snowram/craft-mats' into 'master' 
Snowram/craft mats

See merge request veloren/veloren!2269
 2021-05-07 17:03:45 +00:00
Snowram
831bfd0be9 Snowram/craft mats 2021-05-07 17:03:45 +00:00
Marcel
00493cb9e0 Merge branch 'juliancoffee/update-uk_UA' into 'master' 
Update uk_UA

See merge request veloren/veloren!2267
 2021-05-07 14:32:03 +00:00
Illia Denysenko
07ba3e659d Update uk_UA 2021-05-07 14:32:03 +00:00
Justin Shipsey
395ac5c255 Merge branch 'juliancoffee/animal_trainer_transfer' into 'master' 
Transer Animal Trainers to lvl5 dungeons

See merge request veloren/veloren!2266
 2021-05-07 14:13:10 +00:00
juliancoffee
9ed15105c5 Transer Animal Trainers to lvl5 dungeons 2021-05-07 14:50:03 +03:00
Samuel Keiffer
a2999ce96f Merge branch 'aweinstock/damage-types' into 'master' 
Add `DamageKind`, and make piercing damage partially ignore damage resistence.

See merge request veloren/veloren!2262
 2021-05-06 22:22:49 +00:00
Avi Weinstock
e4cda4309e Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00