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,299 Commits 151 Branches 18 Tags
Commit Graph

8299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Avi Weinstock
f7bc0cd429 Remove the dependency of the new mindflayer AI on action_state.timer. 2021-05-09 21:16:57 -04:00
Marcel
86724bee0a Merge branch 'juliancoffee/downgrage_git2' into 'master' 
Downgrade git2 to compile on windows

See merge request veloren/veloren!2284
 2021-05-09 23:14:45 +00:00
Avi Weinstock
6ac0f6fdd9 Change agent's condition field back to a bool (from bitflags) and add a separate int_counter field. 2021-05-09 18:09:53 -04:00
Avi Weinstock
7103467d1a Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
juliancoffee
d2cba0f4e5 remove ssh feature from git2 2021-05-10 00:49:45 +03:00
Samuel Keiffer
99840a8569 Merge branch 'juliancoffee/miniboss_quick_fix' into 'master' 
Miniboss Loot quickfix

See merge request veloren/veloren!2279
 2021-05-09 21:29:35 +00:00
Illia Denysenko
3dab8786f1 Miniboss Loot quickfix 2021-05-09 21:29:35 +00:00
juliancoffee
6cfd9c24b3 Downgrade git2 to compile on windows 2021-05-10 00:09:33 +03:00
Joshua Yanovski
0ea10ff950 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
173abedfca update CHANGELOG 2021-05-09 20:43:13 +03:00
juliancoffee
4ac795c982 Add species to /spawn auto-complete 2021-05-09 20:43:13 +03:00
Benoît du Garreau
9cfe2911e5 Only load images as PNG 2021-05-09 19:02:48 +02:00
Marcel
53adfabfd0 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
85e879a549 style convention 2021-05-09 19:05:01 +03:00
juliancoffee
7bec0bc529 add authors 2021-05-09 13:12:26 +03:00
juliancoffee
ab2ee20ba3 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
d4fd0d6b96 Search for assets in workspace root 2021-05-09 13:12:26 +03:00
juliancoffee
ce68d0268e Fix paths and adding tests 2021-05-09 13:12:26 +03:00
juliancoffee
04de189427 rename i18n/src/i18n.rs to i18n/src/data.rs 2021-05-09 13:12:26 +03:00
juliancoffee
5bd4dcc167 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
45af1a8446 Make fields more private 2021-05-09 13:12:26 +03:00
juliancoffee
79ab181125 remove unneeded imports 2021-05-09 13:12:26 +03:00
juliancoffee
696136fffc Use hashbrown 2021-05-09 13:12:26 +03:00
juliancoffee
53314e8961 Remove unused dependencies 2021-05-09 13:12:26 +03:00
juliancoffee
333754b2e6 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
b4bd196837 use hashbrown instead of std::collections 2021-05-09 13:12:26 +03:00
juliancoffee
1ab817b4ba Update instuction for using binary 2021-05-09 13:12:26 +03:00
juliancoffee
2d9f4d4a95 Add comments 2021-05-09 13:12:25 +03:00
juliancoffee
684f7f6e0a Integrate verification from i18n_check 2021-05-09 13:12:25 +03:00
juliancoffee
0611b166ed 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
6bc6f6bbba 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
e5613603e4 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
d161d63184 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
0aa2c129b8 Better inactive/active audio slider logic 2021-05-09 09:51:41 +00:00
Avi Weinstock
1580fbe339 Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE. 2021-05-08 17:49:51 -04:00
Marcel
7a0f4f1dec 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
7e85e35ff9 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
274655c45f 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
ac1b01c636 /skill_preset command 2021-05-08 15:47:09 +00:00
Avi Weinstock
bb2c5ce5d3 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
be8a509ef2 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
32ae8420fe Fix #1105: Move server event so it does not emit constantly during build up 2021-05-07 15:40:11 -07:00
Adam Strauss
0e6f9a5599 Implement #1105: Rolling removes burning debuff 2021-05-07 15:38:41 -07:00
Snowram
3ab4ace814 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
f9216df5bd 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
1954070b52 Update pt br 20210507 2021-05-07 20:07:14 +00:00
Samuel Keiffer
b39489bc3f 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
cfae6a52b3 Fixes object manifest 2021-05-07 22:04:57 +02:00
Avi Weinstock
8dc20d0dd5 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
a629936686 Merge branch 'snowram/craft-mats' into 'master' 
Snowram/craft mats

See merge request veloren/veloren!2269
 2021-05-07 17:03:45 +00:00