Joshua Yanovski
3dc973e0be
Major speedups with SIMD.
2020-08-07 23:50:27 +02:00
Joshua Yanovski
77a8c7c267
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-07 06:47:10 +02:00
Joshua Yanovski
6d425f125e
Fix various migration issues.
2020-08-07 01:35:51 +02:00
Silentium2318
1c40218de9
More weapon and hit box tweaks
2020-08-06 09:43:47 -05:00
Joshua Yanovski
b44e442325
Miscellaneous performance improvements.
2020-08-06 13:40:35 +02:00
Imbris
c2f3e1b47f
Revert "Merge branch 'BottledByte/ability_design' into 'master'"
...
This reverts merge request !1264
2020-08-06 08:04:03 +00:00
Imbris
a0b1259b7e
Merge branch 'BottledByte/ability_design' into 'master'
...
Add ability IDs and use them in GUI
See merge request veloren/veloren!1264
2020-08-06 04:44:51 +00:00
BottledByte
34c87d7a86
Add ability IDs and use them in GUI
2020-08-05 23:00:43 +02:00
BottledByte
ab1c43be84
Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar
...
Also fixed two wrong asset references and did some .ron formatting
2020-08-05 01:21:42 +02:00
Joshua Yanovski
d4d4956e92
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-08-02 20:56:54 +02:00
BottledByte
dc91209a7b
Removed fine-grained Item enums and replaced them with Strings
...
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
2020-08-02 01:21:32 +00:00
Samuel Keiffer
f930f52df5
Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow.
2020-08-01 20:08:30 +00:00
Imbris
f589564760
Fix glyph to large panic
2020-07-31 01:13:31 -04:00
Marcel Märtens
7f97baca70
switch to auth that doesn't use agent
2020-07-31 01:05:01 +02:00
Marcel Märtens
0d5e61c4b6
update auth to newest version
2020-07-29 19:28:22 +02:00
Joshua Yanovski
56da06f7a3
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-07-29 18:56:52 +02:00
Marcel Märtens
96cde882ef
update auth to the newest version and remove useless dep
2020-07-29 00:05:23 +02:00
Joshua Yanovski
13b6d4d534
Removing WORLD_SIZE, part 1.
...
Erased almost every instance of WORLD_SIZE and replaced it with a local
power of two, map_size_lg (which respects certain invariants; see
common/src/terrain/map.rs for more details about MapSizeLg). This also
means we can avoid a dependency on the world crate from client, as
desired.
Now that the rest of the code is not expecting a fixed WORLD_SIZE, the
next step is to arrange for maps to store their world size, and to use
that world size as a basis prior to loading the map (as well, probably,
as prior to configuring some of the noise functions).
2020-07-28 10:55:48 +02:00
Joshua Yanovski
7d56ba31b4
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-07-27 13:16:27 +02:00
Samuel Keiffer
527e7a329e
Armor fixes
2020-07-25 23:57:04 +00:00
Marcel
d25508e2df
Merge branch 'lausek/admin-joining' into 'master'
...
fix #660 ; Admins should join even if they aren't on whitelist
Closes #660
See merge request veloren/veloren!1219
2020-07-23 17:16:52 +00:00
lausek
f7a3a622e5
fix #660 ; Admins should join even if they aren't on whitelist
2020-07-23 17:16:52 +00:00
Monty Marz
9497d7e711
Update terrain.rs
2020-07-23 15:01:39 +02:00
Monty Marz
31cfc05123
lots of things
...
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
2020-07-23 12:10:13 +00:00
Marcel Märtens
46b4c87cf3
fixed !688
2020-07-22 09:50:26 +02:00
T-Dark0
fd9ec8fbd0
Voxygen and server-cli no longer panic if server creation returns error
...
The process just exists instead
2020-07-21 09:59:00 +00:00
Joshua Yanovski
51ff7cded2
Fix corrupted character inventories by adding protection.
...
This is a temporary bandaid until we move to our new schema, but it
should at least allow people to log in with old characters.
2020-07-20 02:34:43 +02:00
Imbris
db36578f83
Merge branch 'Menko/utility_items_fix_issue_612' into 'master'
...
#612 Fixed utility items not being removed from inventory/hotbar
See merge request veloren/veloren!1123
2020-07-18 02:41:45 +00:00
Nemanja
5caa6a07b0
#612 Fixed utility items not being removed from inventory/hotbar
2020-07-18 02:41:45 +00:00
Justin Shipsey
5d18fc26f5
Merge branch 'sam/armor-stats' into 'master'
...
Armor Protection Stat
Closes #640
See merge request veloren/veloren!1204
2020-07-18 00:05:28 +00:00
Samuel Keiffer
6cce09be85
Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.
2020-07-18 00:05:28 +00:00
Imbris
9e880009e0
Loosen in_vd calculation on the server so that it accepts all chunks a client with the specified vd would request
2020-07-17 17:32:31 +01:00
T-Dark0
d5e9e19881
Created banned words file
...
By default, it's an empty list
2020-07-16 14:05:35 +00:00
Marcel Märtens
6c59caf8e1
make prometheus
optional in network and fix a panic in the server
...
- an extra interface `new_with_regisitry` was created to make sure the interface doesn't depend on the features
2020-07-15 16:45:49 +02:00
Joshua Barretto
8d6b442193
Crafting
2020-07-14 20:11:39 +00:00
Marcel
d5bfae886e
Merge branch 'xMAC94x/net-improve' into 'master'
...
xMac94x/net improve
See merge request veloren/veloren!1162
2020-07-14 14:09:43 +00:00
Joshua Barretto
446923f7d8
Merge branch 'zesterer/small-fixes' into 'master'
...
Zesterer/small fixes
See merge request veloren/veloren!1190
2020-07-14 09:54:17 +00:00
Marcel Märtens
c74e5e4b47
Changes requested in rewiew
2020-07-13 23:41:32 +02:00
Ben Wallis
a9be045cb8
Fixed suppressed clippy warnings for #587 - useless_conversion
2020-07-13 20:57:13 +01:00
Marcel Märtens
6db9c6f91b
fix a followup bug, after a protocol fail now Participant is closed, including all streams, so we get the stream errors.
...
We MUST handle them and we are not allowed to act on a stream after it failed, as i am to lazy to change the structure to ensure the client to be imeadiatly dropped i added a AtomicBool to it.
2020-07-13 13:03:35 +02:00
Marcel Märtens
df45d35c0e
tcp protocol hardening
...
- make it harder for the server to crash and also kill invalid sessions properly (instead of waiting for them to close)
- introduce macros to reduce code duplication
- added tests to check for valid handshake as well as garbage tcp
2020-07-13 13:03:25 +02:00
Marcel Märtens
9d32e3f884
proper voxygen connect and code cleanups:
...
- voxygen abort when the server has a invalid veloren_network handshake, e.g. by outdated version instead of try again
- rename Network `Address` to `ProtocolAddr` as sugested by zest as it's a combination of Protocol and std::io::Addr
- remove the manual byte arrays in `protocols.rs` with something more nice
2020-07-13 13:03:20 +02:00
Marcel Märtens
041349be48
Switch API to return Participant rather than Arc<Participant>
...
- API behavior switched!
- the `Network` no longer holds a copy of participant, thus if the return of `connect` (before `Arc<Participant>, now `Participant`) got dropped, the `Participant::Drop` is triggered!
- you can close a Participant async via `Particiant::disconnect()`, no more need to know the network at this point
- the `Network::Drop` will check and drop not yet disconnected Participants.
- you can compare Participants via PartialEq, if they are true they point to the same endpoint (it checks remote_pid)
- Note: multiple Participants are only supported in theory, wont work yet
Additionally:
- fix some `debug!`
- veloren-client will now drop the participant gracefully on shutdown
- rename `error` to `debug` when 2 times Bparticipant shutdown is called, as it is to be expected in a async runtime
2020-07-13 13:03:14 +02:00
Marcel Märtens
9ae1d8474f
dropping participant on client disconnect clients
2020-07-13 13:03:07 +02:00
Joshua Yanovski
6332cbe006
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-07-12 18:47:00 +02:00
Ben Wallis
7f6c892cf0
Added migration to fix characters unable to login due to DashMelee ability change
2020-07-11 15:42:19 +01:00
Songtronix
5b57072064
fix: use correct specs(-idvs) versions
...
related to torvus
2020-07-09 19:46:30 +02:00
Joshua Barretto
23c774c8da
Fixed missed VD update bug
2020-07-09 16:54:10 +01:00
Samuel Keiffer
25c28f26d6
Different body types now have different health values and gain different amounts of healths on leveling.
2020-07-09 00:04:25 +00:00
Ben Wallis
ddb66ec73b
Added CharacterDataError when character list fails to load due to Loadout de-serialization error
2020-07-08 09:34:20 +01:00