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

778 Commits

Author SHA1 Message Date
Imbris
50858245d9 Add timeout's to group invites, and configurable limit to group size 
Fix a few group bugs, enable invite timeout and group limits in ui
 2020-08-08 01:16:35 +02:00
Monty Marz
2232ca78b7 Fixed test world to run again 
Update test_world.rs
 2020-08-08 01:15:58 +02:00
Monty Marz
9869b2a8d7 group leader colouring, offset fix when debug menu is open, 
fixed social tab visuals

text width limit

group interaction wording, group window adjustments
 2020-08-08 01:15:58 +02:00
Monty Marz
a0dd070daf timeout visuals, various small fixes and two new items 2020-08-08 01:15:58 +02:00
Imbris
301205c369 Don't give exp when killing self or group members 2020-08-08 01:15:58 +02:00
Imbris
3c66e786dd Distribute exp evenly and make it easier to target entities 2020-08-08 01:14:19 +02:00
Imbris
320cbc9b3c New group UI functions 2020-08-08 01:14:19 +02:00
Imbris
7f641498ff Integrate groups with chat groups 2020-08-08 01:12:35 +02:00
Imbris
71917f9964 Make entity targeting easier, add EXP sharing 2020-08-08 01:12:35 +02:00
Imbris
03a1c7cd13 Fixes and tweaks for groups 2020-08-08 01:12:35 +02:00
Monty Marz
c5720c02c9 Basic UI 
Basic ui for groups and group window
 2020-08-08 01:12:35 +02:00
Imbris
cf0a727eb6 Add basic group functionality (no voxygen wiring yet) 2020-08-08 01:09:01 +02:00
Joshua Yanovski
3e3da609f4 Fix various migration issues. 2020-08-07 01:35:51 +02:00
Silentium2318
ab594a97fb More weapon and hit box tweaks 2020-08-06 09:43:47 -05:00
Imbris
8f813a3773 Revert "Merge branch 'BottledByte/ability_design' into 'master'" 
This reverts merge request !1264
 2020-08-06 08:04:03 +00:00
Imbris
703da622bb 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
8cbb43ac30 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
b8199542e0 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
BottledByte
c7a5161b43 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
6f73713c79 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
d24ca1a037 Fix glyph to large panic 2020-07-31 01:13:31 -04:00
Marcel Märtens
0713c1dd54 switch to auth that doesn't use agent 2020-07-31 01:05:01 +02:00
Marcel Märtens
e4eb380cdf update auth to newest version 2020-07-29 19:28:22 +02:00
Marcel Märtens
451b6fddef update auth to the newest version and remove useless dep 2020-07-29 00:05:23 +02:00
Samuel Keiffer
527453c54a Armor fixes 2020-07-25 23:57:04 +00:00
Marcel
3ad3d0ec29 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
b870b16c87 fix #660; Admins should join even if they aren't on whitelist 2020-07-23 17:16:52 +00:00
Monty Marz
5ac2d63d96 Update terrain.rs 2020-07-23 15:01:39 +02:00
Monty Marz
6d3f0f2e29 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
21007429cc fixed !688 2020-07-22 09:50:26 +02:00
T-Dark0
d8c6f82d6b 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
c891721f92 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
3a1f63cb4f 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
c3dce91088 #612 Fixed utility items not being removed from inventory/hotbar 2020-07-18 02:41:45 +00:00
Justin Shipsey
c5570915e3 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
7c0f90e6b2 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
414d42f1d8 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
90a41b4687 Created banned words file 
By default, it's an empty list
 2020-07-16 14:05:35 +00:00
Marcel Märtens
2f2b5b4d04 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
1c1229fff9 Crafting 2020-07-14 20:11:39 +00:00
Marcel
91fbe23fb6 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
25266923a9 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
d0f644ddf0 Changes requested in rewiew 2020-07-13 23:41:32 +02:00
Ben Wallis
59c30f4835 Fixed suppressed clippy warnings for #587 - useless_conversion 2020-07-13 20:57:13 +01:00
Marcel Märtens
d335b2f186 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
c9c53fecb3 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
f19fb5aef9 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
caddd2d9c7 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
acc6d1d57d dropping participant on client disconnect clients 2020-07-13 13:03:07 +02:00
Ben Wallis
63260ad880 Added migration to fix characters unable to login due to DashMelee ability change 2020-07-11 15:42:19 +01:00