Imbris
9fb6b84670
Merge branch 'juliancoffee/hud_refactor' into 'master'
...
Skillbar hud refactoring (+ shortened key names)
See merge request veloren/veloren!2663
2021-07-29 16:08:56 +00:00
juliancoffee
a6b7e93854
Improve ability descriptions
2021-07-29 18:27:18 +03:00
Imbris
01d1089a46
Add comment to physics and replace magic number in climbing boost with a named constant, fixes #1002
2021-07-29 03:11:44 -04:00
Marcel
680492cea6
Merge branch 'juliancoffee/entity_refactor' into 'master'
...
Improve terms of EntityConfig and LoadoutBuilder
See merge request veloren/veloren!2688
2021-07-28 23:19:04 +00:00
Ben Wallis
be0a2c0105
Merge branch 'xvar/gotta-catch-em-all' into 'master'
...
Pet persistence
See merge request veloren/veloren!2668
2021-07-28 22:36:42 +00:00
Ben Wallis
01ca6911a9
* Pets are now saved on logout and spawned with the player on login
...
* Pets now teleport to their owner when they are too far away from them
* Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed
* Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID
* Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to
* Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
2021-07-28 22:36:41 +00:00
Ben Wallis
2849117a13
Merge branch 'sql_tweaks' into 'master'
...
Combine multiple inventory loading queries into single reccursive query
See merge request veloren/veloren!2680
2021-07-28 21:11:57 +00:00
Tavo Annus
63be9297e7
Combine multiple inventory loading queries into single reccursive query
2021-07-28 21:11:57 +00:00
Imbris
46c580ddfa
Merge branch 'mohs/918_remove_restrict_mut' into 'master'
...
Mohs/918 remove restrict mut
See merge request veloren/veloren!2690
2021-07-28 20:06:42 +00:00
Thomas Kosel
c8527491cc
#918 reverting wrongly merged inventory related changes.
2021-07-28 21:13:09 +02:00
juliancoffee
4adc045627
Added comments on PositionSpecifier usage
2021-07-28 20:03:23 +03:00
juliancoffee
14ac9a8b4e
Improve terms of EntityConfig and LoadoutBuilder
...
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
2021-07-28 19:19:10 +03:00
Marcel
7ef11a41ef
Merge branch 'fungoid/add_fr_translation_for_gameinput.greet' into 'master'
...
Added fr translation for gameinput.greet
See merge request veloren/veloren!2685
2021-07-28 15:52:16 +00:00
Forest Anderson
94fd755264
Merge branch 'aweinstock/site2-prim-bounds' into 'master'
...
Avoid duplicate work across chunks when blitting site2 primitives.
See merge request veloren/veloren!2687
2021-07-28 14:42:40 +00:00
juliancoffee
4811ede2ea
Split Skillbar::update to separate stages
2021-07-28 10:33:51 +03:00
juliancoffee
930a156cab
display_shortened for keys
2021-07-28 10:33:51 +03:00
juliancoffee
034913a22d
Update skillbar ability text
2021-07-28 10:33:51 +03:00
juliancoffee
1bdab02aad
Deduplicate bar text
2021-07-28 10:33:51 +03:00
juliancoffee
e6c451ca4b
Prettify skillbar code
2021-07-28 10:33:50 +03:00
juliancoffee
e6f2dc314c
Deduplicate skillbar slots
2021-07-28 10:33:50 +03:00
Avi Weinstock
60a5373b04
Avoid duplicate work across chunks when blitting site2 primitives.
2021-07-27 19:12:51 -04:00
Marcel
3497f4fa12
Merge branch 'xMAC94x/map_fix' into 'master'
...
fixed map to zoom and drag correctly, fixed #1111
Closes #1111
See merge request veloren/veloren!2659
2021-07-27 22:16:22 +00:00
Thomas Kosel
acb7f5dc4b
#918 remove usages of .restrict_mut() from character_behavior.rs
2021-07-27 23:34:16 +02:00
Thomas Kosel
27f666622f
#918 remove usages of .restrict_mut() from mount.rs and stats.rs
2021-07-27 22:22:39 +02:00
Marcel
7a3755b7b0
Merge branch 'tygyh/Update-missing-swedish-translations' into 'master'
...
Tygyh/update missing swedish translations
See merge request veloren/veloren!2667
2021-07-27 11:14:52 +00:00
Jonathan Berglin
a564602495
Tygyh/update missing swedish translations
2021-07-27 11:14:52 +00:00
Marcel
e15d3bc111
Merge branch 'Fxsch/Fix-spelling-errors-in-german-translations' into 'master'
...
Fix spelling errors in German translations
See merge request veloren/veloren!2684
2021-07-27 11:06:22 +00:00
Nico Janzen
84b010f16f
Fix spelling errors in German translations
2021-07-27 11:06:22 +00:00
Alexis Maheu
9ed6abd3d7
Added fr translation for gameinput.greet
2021-07-26 20:29:30 -04:00
Marcel Märtens
4328a45066
fixed map to zoom and drag correctly, fixed #1111
2021-07-27 01:15:06 +02:00
Imbris
d5b134e355
Merge branch 'chat-scrolling-hack' into 'master'
...
Trying to fix chat hiding behind the chat window.
See merge request veloren/veloren!2678
2021-07-26 04:41:15 +00:00
Imbris
b386e71593
Merge branch 'DanTheOne/toggle_chat_shortcut' into 'master'
...
Add shortcut to toggle chat
See merge request veloren/veloren!2683
2021-07-26 03:42:38 +00:00
DanTheOne
18b5c1c35a
Add shortcut to toggle chat
2021-07-26 02:42:35 +02:00
Samuel Keiffer
db559176e9
Merge branch 'sam/fix-weapon-desync' into 'master'
...
Made swapping equipped weapons a server event instead of being called in...
See merge request veloren/veloren!2682
2021-07-26 00:11:37 +00:00
Sam
f164d6036e
Made swapping equipped weapons a server event instead of being called in common to prevent server-client desyncs.
2021-07-25 18:30:17 -05:00
Joshua Barretto
b4f70dcf19
Merge branch 'zesterer/fix-block-hopping' into 'master'
...
Fix block-hopping with strangely sized blocks
See merge request veloren/veloren!2681
2021-07-25 19:49:17 +00:00
Joshua Barretto
199d56b1db
Fix block-hopping with strangely sized blocks
2021-07-25 20:03:17 +01:00
Imbris
1a081cdc5b
Merge branch 'james/map-ui' into 'master'
...
Reduce number of map layers and remove unneeded alpha channel
See merge request veloren/veloren!2676
2021-07-25 17:24:50 +00:00
Imbris
b984bf006f
Merge branch 'tygyh/Resolve-all-'#-allow(clippy--match_single_binding)]'-error-supressions' into 'master'
...
Resolve all '#[allow(clippy::match_single_binding)]' error supressions
See merge request veloren/veloren!2674
2021-07-25 17:24:22 +00:00
Ben Wallis
b6f931a1d2
Merge branch 'aweinstock/revert-incorrect-clippy-changes' into 'master'
...
Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
See merge request veloren/veloren!2679
2021-07-25 17:08:07 +00:00
Avi Weinstock
edad38098f
Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions"
...
This reverts commit 0247ae2bf6
2021-07-25 12:29:21 -04:00
Avi Weinstock
516ad1c772
Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
...
This reverts commit 63eff216f0
2021-07-25 12:28:25 -04:00
Joshua Barretto
3ba6abfcb4
Merge branch 'tygyh/Resolve-clippy-error-supressions' into 'master'
...
Tygyh/resolve clippy error supressions
See merge request veloren/veloren!2675
2021-07-25 15:35:14 +00:00
Jonathan Berglin
cd2992afd3
Tygyh/resolve clippy error supressions
2021-07-25 15:35:14 +00:00
KK
f473265fb0
This little hack, tries to fix the bad Behavior hiding the chat behind the chat window.
2021-07-24 22:43:32 -07:00
James Melkonian
54eb97b9de
Reduce number of map layers and remove unneeded alpha channel
2021-07-24 19:54:40 -07:00
Joshua Barretto
37077b5703
Merge branch 'Resolve-unused-clippy-supressions' into 'master'
...
Resolve unused clippy supressions
See merge request veloren/veloren!2673
2021-07-24 20:44:06 +00:00
Dr. Dystopia
c79975dc5d
Resolve all '#[allow(clippy::match_single_binding)]' error supressions
2021-07-24 22:11:50 +02:00
Joshua Barretto
43ae09d2f0
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
update (uk_UA) translation
See merge request veloren/veloren!2669
2021-07-24 19:56:21 +00:00
Dr. Dystopia
04700982d3
Resolve unused '#[allow(clippy::option_map_unit_fn)]' error supressions
2021-07-24 20:35:13 +02:00
