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,421 Commits 151 Branches 18 Tags 2.1 GiB
aa1e292b03
Commit Graph

8421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Monty Marz
335b4c5420 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
a17bb0ad73 Better inactive/active audio slider logic 2021-05-09 09:51:41 +00:00
Avi Weinstock
0f424ec95a Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE. 2021-05-08 17:49:51 -04:00
Marcel
eb3cc2fd22 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
2ea69a6180 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
39843860fb 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
1c22a2b3fd /skill_preset command 2021-05-08 15:47:09 +00:00
Avi Weinstock
560c58663e 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
7ec7540be4 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
a5b7e34bf8 Fix #1105: Move server event so it does not emit constantly during build up 2021-05-07 15:40:11 -07:00
Adam Strauss
3d17fde537 Implement #1105: Rolling removes burning debuff 2021-05-07 15:38:41 -07:00
Snowram
ad3a63fc80 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
b6df12040a 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
f517b06d50 Update pt br 20210507 2021-05-07 20:07:14 +00:00
Samuel Keiffer
1f49775aee 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
ec3fa365d0 Fixes object manifest 2021-05-07 22:04:57 +02:00
Avi Weinstock
76da18da3c 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
f552a71d68 Merge branch 'snowram/craft-mats' into 'master' 
Snowram/craft mats

See merge request veloren/veloren!2269
 2021-05-07 17:03:45 +00:00
Snowram
831bfd0be9 Snowram/craft mats 2021-05-07 17:03:45 +00:00
Marcel
00493cb9e0 Merge branch 'juliancoffee/update-uk_UA' into 'master' 
Update uk_UA

See merge request veloren/veloren!2267
 2021-05-07 14:32:03 +00:00
Illia Denysenko
07ba3e659d Update uk_UA 2021-05-07 14:32:03 +00:00
Justin Shipsey
395ac5c255 Merge branch 'juliancoffee/animal_trainer_transfer' into 'master' 
Transer Animal Trainers to lvl5 dungeons

See merge request veloren/veloren!2266
 2021-05-07 14:13:10 +00:00
juliancoffee
9ed15105c5 Transer Animal Trainers to lvl5 dungeons 2021-05-07 14:50:03 +03:00
Samuel Keiffer
a2999ce96f Merge branch 'aweinstock/damage-types' into 'master' 
Add `DamageKind`, and make piercing damage partially ignore damage resistence.

See merge request veloren/veloren!2262
 2021-05-06 22:22:49 +00:00
Avi Weinstock
e4cda4309e Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00
Samuel Keiffer
1ef748c4f3 Merge branch 'james/agent-tactic-refactor' into 'master' 
Move weapon tactics to functions and take target body into attack radius consideration

See merge request veloren/veloren!2263
 2021-05-06 21:17:10 +00:00
James Melkonian
346eb48a27 Move weapon tactics to functions and take target body into attack radius consideration 2021-05-06 21:17:05 +00:00
Samuel Keiffer
2c36524c90 Merge branch 'duelsik/wiring-turing-complete' into 'master' 
(Wiring) Logic - make wiring turing complete

See merge request veloren/veloren!2261
 2021-05-06 19:43:37 +00:00
Daniel Mizerski
3197bcd12a (Wiring) Logic - make wiring turing complete 2021-05-06 19:53:12 +02:00
Benoît du Garreau
77b086c242 Guess image format from file extension 2021-05-06 17:49:25 +02:00
Marcel
8ae1d106cf Merge branch 'xMAC94x/fixcrashes' into 'master' 
revert Client drop to be correct again and also stop network properly

See merge request veloren/veloren!2250
 2021-05-06 12:15:45 +00:00
Marcel
91f76d3b00 Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master' 
instead of manually trying to sync disconnect metrics we now pass a Reason to...

See merge request veloren/veloren!2259
 2021-05-06 11:32:37 +00:00
Marcel Märtens
8196fd8b35 instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect. 
There we make sure that the disconnect only happens once and decrease the respective Metrics.
Also added more reasons
 2021-05-06 11:43:10 +02:00
Marcel
efed14ccf9 Merge branch 'duelsik/wiring-on-death' into 'master' 
(Wiring) OnDeath

See merge request veloren/veloren!2256
 2021-05-06 09:00:50 +00:00
Samuel Keiffer
b1142a05bf Merge branch 'sam/mindflayer-balance' into 'master' 
Mindflayer Balance Tweaks

See merge request veloren/veloren!2257
 2021-05-05 22:12:01 +00:00
Marcel
d1210ade4a Merge branch 'juliancoffee/fix_dropall' into 'master' 
Don't drop Debug item with /dropall

Closes #1059

See merge request veloren/veloren!2236
 2021-05-05 20:35:57 +00:00
Illia Denysenko
2c14f59a35 Don't drop Debug item with /dropall 2021-05-05 20:35:57 +00:00
Sam
dc7e45c8bd Rebalancing 2021-05-05 14:43:56 -04:00
Daniel Mizerski
b34704ea3f (Wiring) OnDeath 2021-05-05 19:08:18 +02:00
Marcel
bd966eaf4b Merge branch 'duelsik/wiring-switch-to-maybes' into 'master' 
(Wiring) Switch to using maybes

See merge request veloren/veloren!2255
 2021-05-05 16:21:19 +00:00
Daniel Mizerski
a2a0329440 (Wiring) Switch to using maybes 2021-05-05 16:59:17 +02:00
Marcel
3ddbb479f2 Merge branch 'xMAC94x/get_rid_of_useless_threadpool' into 'master' 
rayon::join creates a global threadpool, which is only used in /world

See merge request veloren/veloren!2251
 2021-05-05 13:43:18 +00:00
Marcel Märtens
4cfdbdd069 use a constant for recommended_threads 2021-05-05 14:35:06 +02:00
Marcel Märtens
68d326c817 revert Client drop to be correct again and also stop network properly, reduce timeout to 10s 2021-05-04 22:34:19 +02:00
Marcel Märtens
76319cb260 cleanup some unused functions, which were exported but never used 2021-05-04 22:13:04 +02:00
Marcel Märtens
0142cf37f0 limit tokio threads to 1/4 of num_cpus 
make sure that rayon has at least 2 threads even on 1cpu systems to increase stability
 2021-05-04 21:06:11 +02:00