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

1152 Commits

Author SHA1 Message Date
CapsizeGlimmer
aaf9af16df Base implementation of /group /faction /say /region 2020-06-27 16:26:02 -04:00
Delyth Williams
c4c8235c6b Welsh pixie/armour 2020-06-26 16:26:00 +00:00
Monty Marz
0ff533b149 Merge branch 'WelshPixie/FluffyBunnySlippers' into 'master' 
Added fluffy jackalope slippers

See merge request veloren/veloren!1114
 2020-06-25 22:07:47 +00:00
Monty Marz
508d23c4db Merge branch 'WelshPixie/grassets' into 'master' 
Welsh pixie/grassets

See merge request veloren/veloren!1106
 2020-06-25 21:12:31 +00:00
Delyth Williams
d646a07ee6 Welsh pixie/grassets 2020-06-25 21:12:31 +00:00
Monty Marz
5505176baf Merge branch 'WelshPixie/spaulders' into 'master' 
added seven new shoulder armour types

See merge request veloren/veloren!1115
 2020-06-25 20:50:06 +00:00
WelshPixie
bdec773d29 Added fluffy jackalope slippers 2020-06-25 22:47:17 +02:00
Joshua Barretto
17c2ec9dde Fmt, fixed chat-cli problem 2020-06-25 19:50:04 +01:00
Joshua Barretto
f2eff640b3 Added settings editing, set_motd command 2020-06-25 18:57:29 +01:00
Joshua Barretto
e64a71d34e Added MOTD on login, MOTD editing 2020-06-25 18:57:26 +01:00
Joshua Barretto
888ea1e895 Added server-side maximum view distance setting 2020-06-25 18:46:04 +01:00
WelshPixie
126c93d72b added seven new shoulder armour types 2020-06-25 18:36:24 +02:00
Imbris
eccd7f1653 Merge branch 'shandley/character-loading' into 'master' 
Move character DB ops off the main thread

See merge request veloren/veloren!1075
 2020-06-25 16:16:15 +00:00
Songtronix
ce5b2b9ffc feat: add server whitelist 2020-06-24 17:36:19 +02:00
Shane Handley
cb937d9e23 - Move the remaining character data loading to the message/thread formatharacter list actions 
- Handle/notify the client of errors during character load by returning to character select with the error, clean up client and server states
- Add player_uuid check when loading character data.
 2020-06-24 11:47:41 +10:00
Shane Handley
db3833a04e Fix clippy warnings after toolchain update 2020-06-23 16:52:04 +10:00
Marcel Märtens
79feb6dceb switch log behavior for env variable and removed gfx spam by default 2020-06-22 16:49:40 +02:00
Marcel Märtens
f2f3cd2f28 switch to tracing stlye and enhance logs with usefull information 
- Updated CHANGELOG
- reduce dependencies
- found out that we have alot of duplicate coding... alot...
 2020-06-22 09:53:15 +02:00
Kevin Glasson
cfe09c2f55 Convert all other veloren crates to use tracing 
- Completely removed both `log` and `pretty_env_logger` and replaced
with `tracing` and `tracing_subscriber` where necessary.

- Converted all `log::info!(...)` et al. statements to just use the
shorthand macro i.e. `info!`. This was mostly to make renaming easier.
 2020-06-21 23:19:41 +08:00
Forest Anderson
a3247f4542 Expand on documentation 2020-06-19 21:13:00 -04:00
Marcel
15d9b88647 Merge branch 'xvar/fix-server-crash-on-high-char-lvl-login' into 'master' 
Server: Fixed panic on extremely high level character login due to exp overflow (#597)

See merge request veloren/veloren!1091
 2020-06-18 20:24:49 +00:00
Ben Wallis
3aab38edef Server: Fixed panic on extremely high level character login due to exp overflow (#597) 2020-06-18 20:45:37 +01:00
scott-c
89eda13b19 Remove wield requirement to swap loadout 2020-06-17 21:34:58 +08:00
Justin Shipsey
ead6494ca6 Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding 2020-06-16 21:32:39 +00:00
Imbris
d349c35d32 Merge branch 'scott-c/wield-changes' into 'master' 
Scott c/wield changes

See merge request veloren/veloren!1072
 2020-06-15 20:51:35 +00:00
Delyth Williams
8b63fe7f15 added new flora 2020-06-15 16:39:21 +00:00
scott-c
61571a8e74 Adjust character state's energy regen 2020-06-15 18:13:47 +08:00
scott-c
3ec8b7436d reset energy regen on ability use instead of wield 2020-06-15 18:12:30 +08:00
scott-c
ede5f6a48e automatically wield on secondary or ability3 2020-06-15 18:12:30 +08:00
Forest Anderson
d1dc5400d8 Added loadout replace test and documentation 
Finished documenting
 2020-06-14 16:16:53 -04:00
Forest Anderson
6deaae8d74 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Forest Anderson
4cd8902017 Add unequip tests 2020-06-14 13:56:17 -04:00
Imbris
866bb8cc7f Merge branch 'xvar/clippy-globally-suppress-option_map_unit_fn' into 'master' 
Globally suppressed clippy lint option_map_unit_fn for #587

See merge request veloren/veloren!1071
 2020-06-14 16:48:07 +00:00
Ben Wallis
3d28f97f51 Globally suppressed clippy lint option_map_unit_fn for #587 2020-06-14 16:48:07 +00:00
Imbris
b22af56ba9 Merge branch 'xvar/clippy-fixes-redundant_closure_found' into 'master' 
Fixed suppressed clippy warnings for #587 - redundant_closure

See merge request veloren/veloren!1065
 2020-06-14 16:33:04 +00:00
Justin Shipsey
509ea38739 asset 
missing fix
 2020-06-14 09:22:21 +00:00
Ben Wallis
dcf84b3ff5 Fixed suppressed clippy warnings for #587 - redundant_closure 2020-06-12 20:47:22 +01:00
Marcel Märtens
cb03bc61d7 dependency reduction: 
- authc no longer uses reqwest
 - image only supports PNG
 - replace routille with tiny_http
 - several other dependencies
 - cargo upgrade
 - following improvement was measured on R7 1700X:
   before:
    - cargo build: 3076.73s user / 4:45 total / 589 dependencies
    - cargo test: 6118.38s user / 7:30 total / 959 dependencies
   after:
    - cargo build: 2680.54s user / 4:05 total / 480 dependencies
    - cargo test: 5351.81s user / 7:04 total / 791 dependencies
 - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
 2020-06-11 20:55:34 +02:00
Ben Wallis
22bcda3e50 Suppressed all existing clippy warnings in preparation for fixes as part of #587 2020-06-10 22:01:42 +01:00
Ben Wallis
c1c0ef5904 Initial clippy fixes as discussed in #587 2020-06-08 21:27:51 +01:00
Shane Handley
673f6a4b17 Post-rebase fix. 2020-06-08 10:19:42 +10:00
Shane Handley
337c277a6b Handle TripleStrike stages individually. 2020-06-08 10:19:42 +10:00
Shane Handley
afc6d2ab13 Fix some updated weapon references and an incomplete match after rebasing. 2020-06-08 10:19:42 +10:00
Shane Handley
016ebc7f71 Introduce a ToolCategory so we can ignore the specific type of weapon 
when deciding on the SFX to play when wielding/attacking.
 2020-06-08 10:19:42 +10:00
Shane Handley
97e8a96586 Target the specific attack types, to handle TripeStrike etc... 
Removed the Axe sfx until the animations show the swing
 2020-06-08 10:19:41 +10:00
Shane Handley
b131ba5b06 Add initial attack sfx code with bow shot sounds. 2020-06-08 10:19:41 +10:00
S Handley
45949e7577 Update CHANGELOG and a TODO, fix safer deserialisation for inventory 
data.
 2020-06-04 11:44:33 +00:00
Monty Marz
2ff1edae28 More item drops 2020-06-03 17:59:09 +00:00
Joshua Barretto
38ed85ab38 Merge branch 'zesterer/small-fixes' into 'master' 
Better physics comments, removed camera snapping

See merge request veloren/veloren!1034
 2020-06-01 20:50:24 +00:00
Joshua Barretto
6365015cd1 Better physics comments, removed camera snapping 2020-06-01 21:33:20 +01:00