Joshua Barretto
91ea29f108
Merge branch 'capucho/more-uniformity' into 'master'
...
Fix uniformity bug in ui shader
See merge request veloren/veloren!2709
2021-07-31 21:33:34 +00:00
João Capucho
82489782b4
Fix uniformity bug in ui shader
2021-07-31 21:34:29 +01:00
Joshua Barretto
422e1c30f4
Added menacing, made agent code less hacky
2021-07-31 20:33:28 +01:00
Monty Marz
7acca36629
Merge branch 'pfau/fix_i18n' into 'master'
...
fix i18n for shortsword in char creation
See merge request veloren/veloren!2705
2021-07-31 16:58:20 +00:00
Monty Marz
f3d0d3f46a
fix i18n
2021-07-31 18:17:34 +02:00
Imbris
c5c8ae4d30
Replace stamina -> energy in english localization strings
2021-07-31 01:35:28 -04:00
Imbris
89eee332c9
Replace stamina -> energy in code, i18n keys, and asset names
2021-07-31 01:34:40 -04:00
Marcel
e1dad0d997
Merge branch 'snowram/retry-release-ci' into 'master'
...
Retry release jobs on failure
See merge request veloren/veloren!2702
2021-07-31 03:02:59 +00:00
Imbris
3ddbb0a5fb
Merge branch 'mohs/refactoring_character_behavior' into 'master'
...
reducing complexity of character_behavior's run method by extracting logical pieces.
See merge request veloren/veloren!2697
2021-07-31 02:47:55 +00:00
Imbris
119c72f5d8
Fix typo in log message and remove prefixed '_' from a few used variables
2021-07-30 22:10:12 -04:00
Snowram
a3851c9214
Retry release jobs on failure
2021-07-31 00:09:54 +02:00
Thomas Kosel
2bf8a8c55c
improving code quality by removing superfluous &
2021-07-30 10:12:20 +02:00
Imbris
091dae07a4
Merge branch 'imbris/admin-cmd' into 'master'
...
Make admin adding/removing command arguments positional again
See merge request veloren/veloren!2700
2021-07-30 06:05:29 +00:00
Imbris
172bddf731
Make admin add/remove command arguments positional again
2021-07-30 01:25:38 -04:00
Imbris
c4ec279121
Add feature to profile memory allocation with Tracy
2021-07-30 01:06:57 -04:00
Monty Marz
8827d40660
Merge branch 'pfau/dualwield_starters' into 'master'
...
Remove sceptre, add swords
See merge request veloren/veloren!2692
2021-07-29 22:38:36 +00:00
Monty Marz
14eb0f9aa2
Remove sceptre, add swords
2021-07-29 22:38:35 +00:00
Thomas Kosel
3735688e4c
changing <Sys> to Self to be a little more speaking and less riddles.
2021-07-29 23:14:46 +02:00
Marcel
c98fd2f27a
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
Thomas Kosel
005c33bb28
renaming methods to match the names of the methods called within
2021-07-29 22:55:58 +02:00
Thomas Kosel
0b07b14093
moving CharacterState interpreting methods to character_state.rs
2021-07-29 22:38:20 +02:00
Marcel Märtens
c234f1d926
mark missing files as untranslated
2021-07-29 22:18:47 +02:00
Marcel Märtens
4c0b74150d
remove some reexports
2021-07-29 22:18:34 +02:00
Imbris
20e7ec0423
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
aa3ede79c1
Prevented mountable pets
2021-07-29 19:04:07 +00:00
Marcel Märtens
c3aa4c54a9
extract path logic
2021-07-29 20:15:23 +02:00
Marcel Märtens
bdda5ccd72
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
a5696e83a9
experiment with a git cache
2021-07-29 20:12:30 +02:00
Dr. Dystopia
c501b2eb70
base framework to print csv
2021-07-29 20:12:18 +02:00
Marcel Märtens
c9c32eea65
add a argument for i18n to enable csv generation
2021-07-29 20:12:13 +02:00
Imbris
c8db3e3d95
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
Thomas Kosel
93045ba1ee
reducing complexity of character_behavior's run method by extracting logical pieces.
2021-07-29 20:09:31 +02:00
Imbris
6b54bedcd0
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
c56ecee988
Fix non uniform control flow in shader
2021-07-29 18:05:27 +01:00
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
