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,167 Commits 151 Branches 18 Tags 2.1 GiB
xvar/extra-equip-slots
Commit Graph

8167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
4e5a456b18 Balance tweaks. 2021-05-10 18:53:49 -05:00
Snowram
47a2bf7de8 Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
c67c56d194 Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
1c8db241e2 Golem AI 2021-05-10 18:53:43 -05:00
Sam
5fa4358e74 Clay golem attacks done. 2021-05-10 18:53:01 -05:00
Marcel
217462805d Merge branch 'juliancoffee/improve_i18n_check' into 'master' 
Refactor i18n analysis code and improve UX of testing binary

See merge request veloren/veloren!2289
 2021-05-10 22:13:01 +00:00
Illia Denysenko
f626d27955 Refactor i18n analysis code and improve UX of testing binary 2021-05-10 22:13:00 +00:00
Marcel Märtens
b4de3fcda1 DO no longer sponsors us in 2021 2021-05-10 23:29:13 +02:00
Snowram
43593bc4c9 Merge branch 'pfau/fix-1h-axes' into 'master' 
Fix 1h-axes

See merge request veloren/veloren!2287
 2021-05-10 20:44:10 +00:00
Monty Marz
fab3794bf3 Fix 1h-axes 2021-05-10 20:44:09 +00:00
Joshua Yanovski
51911417ee Open stdin when using Veloren with docker. 
This allows entering CLI commands like `help`, `admin add`, and
`shutdown` directly using `docker attach`, rather than needing to run
server-cli commands separately or perform a manual reboot or interrupt.
 2021-05-10 11:44:04 -07:00
Joshua Barretto
47e21ae226 Merge branch 'zesterer/small-fixes' into 'master' 
Prevented low FPS from limiting chunk loading performance

See merge request veloren/veloren!2286
 2021-05-10 14:05:07 +00:00
Joshua Barretto
1478daecbc Prevented low FPS from limiting chunk loading performance 2021-05-10 14:23:37 +01:00
Joshua Yanovski
0cf0f59fa7 Merge branch 'sharp/modtools' into 'master' 
Added non-admin moderators and timed bans.

See merge request veloren/veloren!2276
 2021-05-10 04:54:06 +00:00
Joshua Yanovski
e7587c4d9d Added non-admin moderators and timed bans. 
The security model has been updated to reflect this change (for example,
moderators cannot revert a ban by an administrator).  Ban history is
also now recorded in the ban file, and much more information about the
ban is stored (whitelists and administrators also have extra
information).

To support the new information without losing important information,
this commit also introduces a new migration path for editable settings
(both from legacy to the new format, and between versions).  Examples
of how to do this correctly, and migrate to new versions of a settings
file, are in the settings/ subdirectory.

As part of this effort, editable settings have been revamped to
guarantee atomic saves (due to the increased amount of information in
each file), some latent bugs in networking were fixed, and server-cli
has been updated to go through StructOpt for both calls through TUI
and argv, greatly simplifying parsing logic.
 2021-05-09 21:19:16 -07:00
Samuel Keiffer
a86c3af42b Merge branch 'aweinstock/mindflayerfixes-202105' into 'master' 
Mindflayer AI improvments

See merge request veloren/veloren!2285
 2021-05-10 02:54:21 +00:00
Samuel Keiffer
6c9a2663ba Merge branch 'aws107/roll-to-remove-burning' into 'master' 
Implement #1105: Rolling removes burning debuff

Closes #1105

See merge request veloren/veloren!2271
 2021-05-10 02:40:08 +00:00
Avi Weinstock
abcb6f34a3 Remove the dependency of the new mindflayer AI on action_state.timer. 2021-05-09 21:16:57 -04:00
Marcel
c1fc375543 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
1ae105125d 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
1dfcdce1c0 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
93b3d12478 remove ssh feature from git2 2021-05-10 00:49:45 +03:00
Samuel Keiffer
9168ddac75 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
cb2412148b Miniboss Loot quickfix 2021-05-09 21:29:35 +00:00
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