Monty Marz
2466cad155
Remove sceptre, add swords
2021-07-29 22:38:35 +00:00
Marcel
cc337af764
Merge branch 'dystopia/translation_database' into 'master'
...
redo i18n git analysis completly and introduce a way to export csv data
See merge request veloren/veloren!2689
2021-07-29 21:04:18 +00:00
Marcel Märtens
91a5e18fb2
mark missing files as untranslated
2021-07-29 22:18:47 +02:00
Marcel Märtens
cfe3a027be
remove some reexports
2021-07-29 22:18:34 +02:00
Imbris
c504cc09c6
Merge branch 'mix-mountable-pets' into 'master'
...
Prevented mountable pets
See merge request veloren/veloren!2698
2021-07-29 19:41:09 +00:00
Joshua Barretto
a27ea9aab1
Prevented mountable pets
2021-07-29 19:04:07 +00:00
Marcel Märtens
8c5d0665ae
extract path logic
2021-07-29 20:15:23 +02:00
Marcel Märtens
2a314c3cab
redo i18n git analysis completly and introduce a way to export csv data
...
also improve the performance by caching git_graph_descendant
2021-07-29 20:15:14 +02:00
Marcel Märtens
a142d59637
experiment with a git cache
2021-07-29 20:12:30 +02:00
Dr. Dystopia
c797fc29f7
base framework to print csv
2021-07-29 20:12:18 +02:00
Marcel Märtens
f939c5bb2f
add a argument for i18n to enable csv generation
2021-07-29 20:12:13 +02:00
Imbris
83b61447aa
Merge branch 'capucho/shadow-uniformity' into 'master'
...
Fix non uniform control flow in shader
See merge request veloren/veloren!2696
2021-07-29 18:10:01 +00:00
Imbris
14d9d72b5c
Merge branch 'imbris/1002-fix' into 'master'
...
Add comment to physics and replace magic number in climbing boost with a named...
Closes #1002
See merge request veloren/veloren!2694
2021-07-29 17:46:14 +00:00
João Capucho
4bcda1c395
Fix non uniform control flow in shader
2021-07-29 18:05:27 +01:00
Imbris
fe77c6c76d
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
f8f873df3f
Improve ability descriptions
2021-07-29 18:27:18 +03:00
Imbris
f0a5f0890e
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
9b30bb9e7d
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
c93dfc943a
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
f4b3d463c8
* 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
2d878f2a6c
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
709ca85db4
Combine multiple inventory loading queries into single reccursive query
2021-07-28 21:11:57 +00:00
Imbris
3896be8902
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
4e174c0b17
#918 reverting wrongly merged inventory related changes.
2021-07-28 21:13:09 +02:00
juliancoffee
4065f01797
Added comments on PositionSpecifier usage
2021-07-28 20:03:23 +03:00
juliancoffee
9c7f96b6c1
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
1116363aec
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
c5f4f4eb0c
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
d06fe4517e
Split Skillbar::update to separate stages
2021-07-28 10:33:51 +03:00
juliancoffee
e19e524f3a
display_shortened for keys
2021-07-28 10:33:51 +03:00
juliancoffee
afbe7e77e6
Update skillbar ability text
2021-07-28 10:33:51 +03:00
juliancoffee
3487a1ae8d
Deduplicate bar text
2021-07-28 10:33:51 +03:00
juliancoffee
226be88e80
Prettify skillbar code
2021-07-28 10:33:50 +03:00
juliancoffee
2a8d88ed28
Deduplicate skillbar slots
2021-07-28 10:33:50 +03:00
Avi Weinstock
eac1d9c760
Avoid duplicate work across chunks when blitting site2 primitives.
2021-07-27 19:12:51 -04:00
Marcel
cd7d154128
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
554edde64d
#918 remove usages of .restrict_mut() from character_behavior.rs
2021-07-27 23:34:16 +02:00
Thomas Kosel
2ae3f9fc1e
#918 remove usages of .restrict_mut() from mount.rs and stats.rs
2021-07-27 22:22:39 +02:00
Marcel
13b1063406
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
6607c84a90
Tygyh/update missing swedish translations
2021-07-27 11:14:52 +00:00
Marcel
d14ccd568f
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
113fb181a3
Fix spelling errors in German translations
2021-07-27 11:06:22 +00:00
Alexis Maheu
3bd7b4594c
Added fr translation for gameinput.greet
2021-07-26 20:29:30 -04:00
Marcel Märtens
b1818fb4ca
fixed map to zoom and drag correctly, fixed #1111
2021-07-27 01:15:06 +02:00
Imbris
16be0abf6c
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
444094f871
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
47e49f0409
Add shortcut to toggle chat
2021-07-26 02:42:35 +02:00
Samuel Keiffer
6cf5c34541
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
449b4bb3d5
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
c49e29ecde
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
