Commit Graph

607 Commits

Author SHA1 Message Date
0bd08b1f9e Merge branch 'socksonme/rework_sct' into 'master'
Rework SCT

See merge request veloren/veloren!3126
2022-07-02 02:42:42 +00:00
fddc97bc77 Merge branch 'tweaks' into 'master'
tweaks entity stats

See merge request veloren/veloren!3437
2022-06-29 19:29:38 +00:00
f048600335 Add back old i18n + some small fixes
- Fix .filter() for combo_floater
- Rename sct_inc_dmg_accum_duration to sct_inc_dmg, as it was in the
  wrong place

to rebase
2022-06-29 17:31:58 +03:00
2c5fd06d0b Address review
- Change hp_pulse to not be framerate dependent
- Change some of the HpFloater checks to be inside the find() function
- Remove unnecessary join
- Add back option for showing incoming damage + add option for
  experience accumulation
- Change `ExpFloater`s to not store the owner, as they are only shown
  for the player (will have to see if the implementation is correct so
  that it may be applied to the other floaters)
- Rename `Outcome::Damage` to `Outcome::HealthChange` and `DamageInfo`
  to `HealthChangeInfo`
- Update some outdated comments/documentation
2022-06-29 17:31:58 +03:00
eabbfe6a51 Remove damage batch option + crit_mult 2022-06-29 17:31:54 +03:00
762b726d21 basic i18n for english + code touchups
Getting Invalid Probability error when attacking a lot of enemies - needs to be checked out
2022-06-29 17:31:42 +03:00
27e67e79ec (uk_UA) Add abilities translation 2022-06-25 18:19:36 +03:00
8c837da561 Add i18n keys to abilities
* New hud/ability.ron file for ability localizations
* i18n keys are created by adding .name and .desc to ability id. Because
  of how i18n worked (returning key if string wasn't found), it was
  impossible to do because it leads to UB in case string is missed.
  To solve this we've added get_opt method that returns None
* New Localization::get_or method for convinient fallback key usage
2022-06-25 18:17:37 +03:00
95148a9968 tweaks entity stats 2022-06-17 12:35:06 +02:00
45efdb6602 Implement group owned loot 2022-06-04 17:16:12 +00:00
90d3157656 Update ru_RU 2022-05-31 18:21:34 +00:00
34f580dfaa Introduced loot ownership rules to combat loot stealing by players
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
2022-05-28 12:06:49 +00:00
5c2eda64da Merge branch 'christof/MR3316_reworked' into 'master'
MR3316 "Draft: Updated translations" without the directory movement and squashed

See merge request veloren/veloren!3391
2022-05-24 22:10:22 +00:00
2e6e864672 fix missing comma at line ends 2022-05-24 23:31:20 +02:00
a9622fe28e Add a setting to toggle zooming in when charging bow 2022-05-23 23:09:47 +00:00
5ac9c720a1 MR3316 "Draft: Updated translations" without the directory movement and squashed:
Renewed Polish translations
Added spaces and change sequences so code fits to English version
2022-05-22 23:01:40 +02:00
34c12092cc Merge branch 'Samuellm93-master-patch-97383' into 'master'
Update common.ron pt_BR. Added some variables and edited a few.

See merge request veloren/veloren!3387
2022-05-22 13:11:57 +00:00
88eaef3145 Add Thai translation 2022-05-22 10:06:36 +00:00
75d109ef6e Update common.ron pt_BR. Added some variables and edited a few. 2022-05-21 00:11:04 +00:00
73244893cc Merge branch 'update-it_IT' into 'master'
Updated the italian translation

See merge request veloren/veloren!3359
2022-05-19 03:51:44 +00:00
Sam
ba0846d6c7 Addressed more feedback 2022-05-16 15:11:46 -04:00
Sam
9b078c3383 Addressed playtest feedback (assets). 2022-05-16 15:11:38 -04:00
075fee5190 modular component tooltips 2022-05-16 15:11:25 -04:00
3d5e29b44d Ui 2022-05-16 15:11:18 -04:00
be0e322219 Remove "(Items)" from stealth stat descriptions. 2022-05-14 09:34:57 -05:00
ff905fab95 Add stealth stat to Bag UI. NOTE: Needs icon. 2022-05-12 20:26:43 -05:00
387544a0b6 fixed some italian translation errors 2022-05-10 21:10:20 +02:00
f35c98d1a1 Added LoD distance setting 2022-05-10 12:40:06 +01:00
8011866012 updated the italian translation 2022-05-08 21:34:10 +02:00
5f149af1ee Merge branch 'aerialfiddle/be_BY' into 'master'
Belarusian translation: minor fixes

See merge request veloren/veloren!3350
2022-05-05 07:12:15 +00:00
cca14ff4a3 Minor orthography fixes 2022-05-04 16:54:21 +03:00
132fda804e Catalan language improvements 2022-05-01 23:14:25 +00:00
f78245615e FR Translation up to date 2022-04-26 17:29:09 +00:00
ce87cdfd7e Merge branch 'aerialfiddle/be_BY' into 'master'
Added Belarusian translation, 100% complete

See merge request veloren/veloren!3330
2022-04-19 10:16:08 +00:00
c3d4f9972d be_BY minor orthography correction 2022-04-18 22:51:33 +03:00
9a8f405ca8 Added Belarusian translation, 100% complete 2022-04-18 00:04:54 +03:00
f91cdfbf9f ru_RU update 2022-04-14 06:26:32 +00:00
51e50abb4c Update ru_RU 2022-04-10 21:05:23 +00:00
cb88648cca Give NPCs random Big Five personalities. 2022-04-04 20:17:50 +02:00
991cfcaa47 feat: 🌐 add i18n for trade amount input placeholder 2022-03-27 20:24:20 +02:00
bcd4a81174 Merge branch 'galaipa/add-basque' into 'master'
Add initial Basque language translation

See merge request veloren/veloren!3220
2022-03-13 18:37:50 +00:00
Sam
c6dc96b795 Settings button to turn off weapon trails. 2022-03-03 01:10:59 -05:00
2a9f75340a Merge branch 'spanish_translation' into 'master'
apply changes from MR!2904

See merge request veloren/veloren!3224
2022-02-20 16:26:24 +00:00
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
e2648f6733 apply changes from MR!2904 2022-02-20 10:18:24 +01:00
6c7c0eefae Merge branch 'gnarlings' into 'master'
Gnarlings

See merge request veloren/veloren!3194
2022-02-15 00:22:37 +00:00
17d8baa3d9 kick start Arabic language (i18n) 2022-02-13 23:44:52 +00:00
d2da5c18be Add initial Basque language translation 2022-02-13 22:00:53 +01:00
dfb8d37a38 Update swedish translations 2022-02-13 20:39:54 +00:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00