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
12,496 Commits 151 Branches 18 Tags 2.1 GiB
sharp/parallel-grid
Commit Graph

3086 Commits

Author SHA1 Message Date
Joshua Barretto
4181331e6b Balanced rain density 2022-07-04 18:07:00 +02:00
IsseW
273c5ed2f0 Temporary noise solution 2022-07-04 18:07:00 +02:00
IsseW
67683f315f Put rain behind expiremental shader 2022-07-04 18:06:59 +02:00
IsseW
9c84a20cef better sim 2022-07-04 18:06:58 +02:00
IsseW
547301ff5f rainbows 2022-07-04 18:06:57 +02:00
IsseW
78c1de19cf More accurate weather sim 2022-07-04 18:04:39 +02:00
IsseW
6585ef1513 weather dependant music 2022-07-04 18:11:43 +02:00
IsseW
102156c4b3 Better particle light 2022-07-04 18:11:42 +02:00
IsseW
9cb67e6283 Rain shader 2022-07-04 18:11:41 +02:00
IsseW
b7c0196129 Server weather sim 2022-07-04 18:11:41 +02:00
Samuel Keiffer
0bd08b1f9e Merge branch 'socksonme/rework_sct' into 'master' 
Rework SCT

See merge request veloren/veloren!3126
 2022-07-02 02:42:42 +00:00
Imbris
6c8970f6fd Merge branch 'imbris/voxygen-compile-time' into 'master' 
Improve voxygen compile time with small tweak

See merge request veloren/veloren!3449
 2022-07-01 08:22:05 +00:00
Imbris
291a424b4e This seems to save at least 30 seconds (out of 90 to 120 secs) when tweaking TILE_SIZE in voxygen/src/mesh/greedy.rs (NOTE: I did some more timing, see associated MR description) 2022-06-30 00:11:04 -04:00
Marcel
fddc97bc77 Merge branch 'tweaks' into 'master' 
tweaks entity stats

See merge request veloren/veloren!3437
 2022-06-29 19:29:38 +00:00
Socksonme
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
Socksonme
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
socksonme
eabbfe6a51 Remove damage batch option + crit_mult 2022-06-29 17:31:54 +03:00
socksonme
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
juliancoffee
27e67e79ec (uk_UA) Add abilities translation 2022-06-25 18:19:36 +03:00
juliancoffee
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
runrobdog
7a40ae2db7 tweak entity stats adlet/tracker.ron 2022-06-23 17:48:28 +02:00
runrobdog
16d5ea1e3c Set stats of entities movesets under the Object(body) tag to pre-modular and change all entities found within dungeons, to pre-modular stats 2022-06-23 06:45:22 +02:00
runrobdog
8c1d4359a8 tweak stats quadmedquick, blackwidow and throped 2022-06-20 14:12:04 +02:00
runrobdog
1dc89fbc58 tweak stats theropodbasic 2022-06-19 19:04:30 +02:00
runrobdog
37137a040f fix pathing mammoth 2022-06-19 11:25:59 +02:00
runrobdog
25eed55ca9 stat tweaks to theropod, arthropods and basilisk 2022-06-19 01:35:18 +02:00
Sam
1f60bdd452 Removed sticky thread requirement from bow limbs. 2022-06-18 15:19:37 -04:00
runrobdog
10023b0759 tweak entity stats 2022-06-18 12:33:19 +02:00
Sam
4a5ef6dce3 Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage. 
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
 2022-06-17 21:13:45 -04:00
runrobdog
1e289e6335 tweaks entity stats 2022-06-17 21:48:09 +02:00
runrobdog
1e19f5541b tweak entity stats 2022-06-17 21:41:04 +02:00
runrobdog
95148a9968 tweaks entity stats 2022-06-17 12:35:06 +02:00
Imbris
b7096d9f2e Scale shadow grid to multiple texels per grid cell to make it easier to examine 2022-06-05 16:35:12 -04:00
Imbris
9b78d75f06 Add experimental shader option to visualize shadow map texels 2022-06-05 16:35:12 -04:00
terrarier2111
45efdb6602 Implement group owned loot 2022-06-04 17:16:12 +00:00
Christof Petig
f12f79439f fix negative values for RGB and vary dryness and strength according to biome 2022-06-01 22:13:34 +02:00
Christof Petig
827006e7e0 vary color, strength based on position, color on biome 2022-06-01 22:13:34 +02:00
Christof Petig
6ddedecc05 introduce smoke strength and color 2022-06-01 22:13:34 +02:00
Vlad
90d3157656 Update ru_RU 2022-05-31 18:21:34 +00:00
Sam
2de831cf38 Converted asset files of other armors. 2022-05-30 20:25:33 -04:00
Sam
8b384fd63e Converted asset files of set armors. 2022-05-30 20:25:33 -04:00
Sam
5e57eabd11 Code changes and msm 2022-05-30 20:25:31 -04:00
Makselord
4a2cdd08d4 modular weapon modifier costs changed to 1, 2, 5, 10, 15, 25 2022-05-30 09:56:17 -04:00
Makselord
f10b868dbf modular weapon modifier costs changed to 1, 5, 10, 15, 20, 30 2022-05-29 19:50:26 -04:00
Ben Wallis
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
Christof Petig
2bf8e1865f Skiing and ice skating 2022-05-27 17:19:52 +00:00
Makselord
5c8c88b786 fixed silver, gold, copper, tin ingots not showing correctly in crafting 2022-05-26 17:08:39 -04:00
Marcel
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
Christof Petig
2e6e864672 fix missing comma at line ends 2022-05-24 23:31:20 +02:00
Corvella
a9622fe28e Add a setting to toggle zooming in when charging bow 2022-05-23 23:09:47 +00:00
Stanisław Grupiński
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
Hugo Peixoto
fe11d6d5bc Split sky shader's twilight into dawn and dusk 
Instead of having the same color profiles for the sky's color, light,
and halo, we now have the ability to define different values for dawn
and dusk.

The dusk values were unchanged and the dawn values are similar, but with
less red. These should probably be tweaked a bit more.
 2022-05-22 19:54:44 +01:00
Marcel
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
Euryn
88eaef3145 Add Thai translation 2022-05-22 10:06:36 +00:00
Samuel Lopes Mastrofrancisco
75d109ef6e Update common.ron pt_BR. Added some variables and edited a few. 2022-05-21 00:11:04 +00:00
Chase Rozon
7dcee3eb23 Multiple Balance Tweaks & Miscellaneous Changes 2022-05-19 22:46:31 +00:00
Youssef Fahmy
080d8ef8b1 Tweaks for this week 2022-05-19 19:35:31 +00:00
Imbris
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
aeca67443b Simplified item key (assets) 2022-05-18 16:28:10 -04:00
Sam
ba0846d6c7 Addressed more feedback 2022-05-16 15:11:46 -04:00
UncomfySilence
ac124b67a0 minor loot table tweaks and removal of yellow weapon components from caves 2022-05-16 15:11:45 -04:00
Sam
cbf5336343 Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets). 2022-05-16 15:11:45 -04:00
Sam
ad48b634ab Address feedback (assets) 2022-05-16 15:11:44 -04:00
Sam
254b7964e1 Balance tweaks (assets) 2022-05-16 15:11:43 -04:00
Sam
d6ac9c43d7 More feedback addressed (assets). 2022-05-16 15:11:41 -04:00
Sam
13ea6dee93 Addressed second round of balance feedback (assets). 2022-05-16 15:11:40 -04:00
brunt
d46cdf60b5 renamed hilt voxels, adjusted secondary components in item image manifests [ci_skip] 2022-05-16 15:11:39 -04:00
Sam
9b078c3383 Addressed playtest feedback (assets). 2022-05-16 15:11:38 -04:00
brunt
fc28449703 rotate voxels and sceptre positioning [ci_skip] 2022-05-16 15:11:37 -04:00
UncomfySilence
1c626da66b loot tables and adding models 2022-05-16 15:11:36 -04:00
Sam
528b62c59a Rebase commit 2022-05-16 15:11:36 -04:00
Sam
3f2f0a7715 Fixed item drop manifest for secondary components. 2022-05-16 15:11:36 -04:00
Sam
efc0189548 Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (assets). 2022-05-16 15:11:34 -04:00
Sam
49ff094286 Addressed most review comments (assets). 2022-05-16 15:11:33 -04:00
brunt
5ab9c0f1ad sceptre positioning [ci_skip] 2022-05-16 15:11:32 -04:00
Sam
6ccc0b82f0 Models for sceptres and secondary components 2022-05-16 15:11:32 -04:00
Monty Marz
c3f92622c1 bg icons 2022-05-16 15:11:29 -04:00
Bryant Deters
af1a44264a add melee weapons to item_drop_manifest [ci skip] 2022-05-16 15:11:29 -04:00
Bryant Deters
4edd041056 add staffs to item_drop_manifest [ci skip] 2022-05-16 15:11:29 -04:00
Bryant Deters
1ce474adbb modular bow offset tweaks [ci skip] 2022-05-16 15:11:28 -04:00
Bryant Deters
f767e81133 modular staff offsets [ci skip] 2022-05-16 15:11:28 -04:00
Sam
e8c97f7a00 Staff models 2022-05-16 15:11:27 -04:00
Bryant Deters
f1940128bf modular bow offset adjustments [ci skip] 2022-05-16 15:11:27 -04:00
Bryant Deters
075fee5190 modular component tooltips 2022-05-16 15:11:25 -04:00
Snowram
f6343ff4f9 Modular bows offsets 2022-05-16 15:11:24 -04:00
Sam
558e2aefb7 Bow models 2022-05-16 15:11:23 -04:00
Sam
eec0ba18a9 Fixed eldwood recipes returning frostwood components. 2022-05-16 15:11:22 -04:00
Sam
d436362a8d Consolidated crafting UI for the primnary component of modular weapons. 2022-05-16 15:11:21 -04:00
Snowram
74a3f4a7dc Modular 1h weapons offsets 2022-05-16 15:11:21 -04:00
Sam
3702952f99 Added recipes for each material kind. 2022-05-16 15:11:20 -04:00
Sam
ef5b2e4a1e Added method of differing names for 1h and 2h variants of a modular wepaon. 
Added all 1h melee weapon models.
 2022-05-16 15:11:19 -04:00
Monty Marz
3d5e29b44d Ui 2022-05-16 15:11:18 -04:00
Sam
1c0154487a Rebase fixes. 2022-05-16 15:11:18 -04:00
Sam
94c19735ca Fixed broken stuff during rebase. 2022-05-16 15:11:16 -04:00
Sam
5c28e3cb25 Items with components can now have their name modified by the components. Also addressed more review. ONLY ASSETS 2022-05-16 15:11:16 -04:00
Sam
524845b661 Addressed more comments on MR. 2022-05-16 15:11:15 -04:00
Sam
d7f5b907ff Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. ONLY ASSETS 2022-05-16 15:11:14 -04:00
Sam
eecc1b42c3 Fixed regex mistake in changing name of item assets. 2022-05-16 15:11:13 -04:00
Sam
62632318fe Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. ONLY ASSETS 2022-05-16 15:11:12 -04:00
Sam
b048179c0a Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS. 2022-05-16 15:11:11 -04:00
Sam
03ab68eb60 Added models for sword blade, axe head, and hammer head components. 2022-05-16 15:11:09 -04:00
Sam
2aad3f3961 Switched to item list as an input for modular components so that allowed items could be centralized. 2022-05-16 15:11:08 -04:00
Snowram
b01e816c0d Modular axes and hammers offsets 2022-05-16 15:11:08 -04:00
Snowram
e693b3132d Modular swords offsets 2022-05-16 15:11:07 -04:00
Sam
ac306bbec0 Added weapon models for 2h axe, hammer, and sword. 2022-05-16 15:11:07 -04:00
Sam
5acb8cf74e Rebase conflcits handled. 2022-05-16 15:11:05 -04:00
Sam
33feee787b Removed stuff no longer needed after new method of crafting modular weapons. 2022-05-16 15:11:05 -04:00
Sam
b7aa0a7a9f Rebase commit. 2022-05-16 15:11:04 -04:00
Sam
4f466d0523 Modular weapons now work in kits. 2022-05-16 15:11:03 -04:00
Sam
c6b5798cfd Inserted entries in item image and biped weapon manifests to aid in addition of models later. 2022-05-16 15:11:03 -04:00
Sam
ca644f8f0b Added more interesting ingredients to recipes. 
Changed bow main component from held (grip) to damage (limbs).
 2022-05-16 15:11:02 -04:00
Sam
9302a83e8c Added wood into dungeon loot tables. 2022-05-16 15:11:02 -04:00
Sam
a908eb5791 Made a few more changes to migration, removed additional weapon. 2022-05-16 15:11:01 -04:00
Sam
9776760f47 Updated stats on components and edited migration for 1 handed weapons to point to new target modular weapon. 2022-05-16 15:11:00 -04:00
Sam
21084e48f0 Removed old weapons that were migrated to modular weapons. 2022-05-16 15:11:00 -04:00
Sam
c0ac8891ab Added initial recipes for bow, staff, and sceptre components. 2022-05-16 15:10:58 -04:00
Sam
c10fa35fa4 Added correct names to every bow, staff, and sceptre component. 2022-05-16 15:10:58 -04:00
Sam
38cb465722 Fixed loading of modular weapons from the loadout to work with nested components. 
Modular weapons can now be correctly dispalyed when wielded.
 2022-05-16 15:10:57 -04:00
Sam
0a38567e8d Modular weapons can now be properly displayed in the inventory. 2022-05-16 15:10:57 -04:00
Sam
105bb24631 Added placeholder components for bows, staffs, and sceptres. 2022-05-16 15:10:56 -04:00
Sam
762b3be3c3 Modular weapons can now be dropped as loot or assigned to enemies. 2022-05-16 15:10:56 -04:00
Sam
c01fe655f1 Added wood 2022-05-16 15:10:55 -04:00
Sam
d380a2dbaf Quality is now propogated through modular items from the quality of the components. 2022-05-16 15:10:55 -04:00
Sam
c6f4b51215 Removed descriptions from modular weapons and components. 2022-05-16 15:10:54 -04:00
Sam
885bb9aaa7 Added programmatic names for modular components. 2022-05-16 15:10:53 -04:00
Sam
405b9b2448 Modular weapons now have programmatically generated names. 2022-05-16 15:10:53 -04:00
Sam
4e89bc7485 Added test functions to assist in fixing unit tests that broke from changed functionality. 2022-05-16 15:10:52 -04:00
Sam
f9256ecd62 Added recipes 2022-05-16 15:10:51 -04:00
Sam
5898ce9d98 Added axe and hammer components. 2022-05-16 15:10:51 -04:00
Sam
6620c1dd1f Added HandsKind to automatically resolve handedness of modular weapons. 2022-05-16 15:10:51 -04:00
Sam
85b7382487 Added handedness requirements to recipes and components. 2022-05-16 15:10:50 -04:00
Sam
68c8160ecb Added modular components for swords. 2022-05-16 15:10:50 -04:00
Sam
77934c9214 Made changes to crafting to allow modular weapons to work as intended. 2022-05-16 15:10:48 -04:00
Joshua Barretto
eec2d67bb7 Merge branch 'zesterer/worldgen' into 'master' 
Worldgen Improvements

See merge request veloren/veloren!3378
 2022-05-15 19:44:12 +00:00
Joshua Barretto
6ace5adda6 Reduced point light ambiance hack 2022-05-15 16:33:03 +01:00
Joshua Barretto
cc295b483a Better snow cover 2022-05-15 15:34:36 +01:00
Isse
2050bce77d Water caves 2022-05-15 10:16:53 +00:00
holychowders
be0e322219 Remove "(Items)" from stealth stat descriptions. 2022-05-14 09:34:57 -05:00
holychowders
63f829be66 Add icon to stealth stat in Bag UI. 
- Thanks to Toaster for making the icon.
 2022-05-12 20:28:23 -05:00
holychowders
ff905fab95 Add stealth stat to Bag UI. NOTE: Needs icon. 2022-05-12 20:26:43 -05:00
Joshua Barretto
e02f8aee65 Merge branch 'zesterer/lod-objects' into 'master' 
LoD Objects (inc. Trees)

See merge request veloren/veloren!3367
 2022-05-11 14:56:12 +00:00
Joshua Barretto
b42ee3fce2 Avoid expense when LoD voxels are disabled 2022-05-11 15:20:19 +01:00
Joshua Barretto
01e1cb34b0 Fixed minor LoD issues 2022-05-11 15:00:44 +01:00
Joshua Barretto
f21a64e898 Better oak model 2022-05-11 14:47:11 +01:00
Joshua Barretto
9ac84c0a3a Improved LoD models 2022-05-11 12:20:42 +01:00
Joshua Barretto
515abc2b89 Fixed bad entity spawns 2022-05-10 23:25:22 +00:00
Joshua Barretto
5e1f16fb7a Better tree colours 2022-05-11 00:15:05 +01:00
Joshua Barretto
907ba3dcbc Added giant trees to LoD 2022-05-10 20:30:48 +01:00
markobekko
387544a0b6 fixed some italian translation errors 2022-05-10 21:10:20 +02:00
Joshua Barretto
d4fd9d2d0e Added LoD houses 2022-05-10 19:19:46 +01:00
Joshua Barretto
7382aab13a Upped default LoD distance 2022-05-10 17:12:12 +01:00
Joshua Barretto
f35c98d1a1 Added LoD distance setting 2022-05-10 12:40:06 +01:00
Joshua Barretto
add9e5f9fe Better snow cover 2022-05-10 12:40:06 +01:00
Joshua Barretto
c199d17deb Better snow cover 2022-05-10 12:40:06 +01:00
Joshua Barretto
63c8ea58b9 Unbork normals 2022-05-10 12:40:06 +01:00
Joshua Barretto
2d7aa1aaa3 Added no terrain pop experimental shader 2022-05-10 12:40:06 +01:00
Joshua Barretto
596ae73117 Added NoLodVoxels option 2022-05-10 12:40:06 +01:00
Joshua Barretto
39e8b5d468 Hacky normals 2022-05-10 12:40:06 +01:00
Joshua Barretto
c3f30b2188 Offset for side/top texture 2022-05-10 12:40:06 +01:00
Joshua Barretto
3693a439ac Better reflections 2022-05-10 12:40:06 +01:00
Joshua Barretto
e4e50cb50e Better pulldown 2022-05-10 12:40:06 +01:00
Joshua Barretto
a9b2018383 Better snow cover 2022-05-10 12:40:06 +01:00
Joshua Barretto
79ce90a2e4 convert LoD assets to Git LFS 2022-05-10 12:39:50 +01:00
Joshua Barretto
2df01385d2 Voxelise trees 2022-05-10 12:38:37 +01:00
Joshua Barretto
1db7cc7fde LoD trees in snow are white 2022-05-10 12:38:36 +01:00
Joshua Barretto
cf346d05c1 Different kinds of tree 2022-05-10 12:38:36 +01:00
Joshua Barretto
7cce892cff Varying normals 2022-05-10 12:38:36 +01:00
Joshua Barretto
ac0e7a7724 Use dedicated fragment shader 2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687 Initial implementation of LoD trees 2022-05-10 12:38:36 +01:00
IsseW
9abbb0e928 naming behind feature and fix addition overflow 2022-05-10 08:03:40 +02:00
markobekko
8011866012 updated the italian translation 2022-05-08 21:34:10 +02:00
Joshua Barretto
30e73735de Added SpawnMode to allow for ice and water column spawning of wildlife 2022-05-08 12:37:29 +01:00
Marcel
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
Anton Katsuba
cca14ff4a3 Minor orthography fixes 2022-05-04 16:54:21 +03:00
Enrique AM
132fda804e Catalan language improvements 2022-05-01 23:14:25 +00:00
Marcel
a45791dda5 Merge branch 'giant-tree-entities' into 'master' 
Site2 giant tree entity spawning

See merge request veloren/veloren!3344
 2022-04-27 10:53:08 +00:00
Isse
3027597352 Site2 giant tree entity spawning 2022-04-27 10:53:08 +00:00
Clary Chevry
f78245615e FR Translation up to date 2022-04-26 17:29:09 +00:00
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
Marcel
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
Anton Katsuba
c3d4f9972d be_BY minor orthography correction 2022-04-18 22:51:33 +03:00
Anton Katsuba
9a8f405ca8 Added Belarusian translation, 100% complete 2022-04-18 00:04:54 +03:00
aflying pumpkin
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
Vlad
f91cdfbf9f ru_RU update 2022-04-14 06:26:32 +00:00
Влад Куцепалов
51e50abb4c Update ru_RU 2022-04-10 21:05:23 +00:00
juliancoffee
1b18629616 Execute asset migration 2022-04-08 19:17:01 +03:00
juliancoffee
11bf16e3d7 Make ItemSpec and Hands untagged 2022-04-07 18:44:16 +03:00
juliancoffee
dd02e8ae6a Add loadout spec examples 2022-04-07 18:44:15 +03:00
juliancoffee
09d395f528 Remove temporary test files from git repo 2022-04-07 18:44:15 +03:00
juliancoffee
3f7bfff8d7 Implement all needed features 
+ Multiple/Random inheritance for loadout configs
+ Using ItemSpecNew in Hands
+ Rename Hands::Specific to Hands::InHands to represent non-random
  combination
 2022-04-07 18:44:14 +03:00
JakobDev
fbabbbb959 Add German translation to .desktop and metainfo 2022-04-05 08:11:09 +00:00
Tormod G. Hellen
cb88648cca Give NPCs random Big Five personalities. 2022-04-04 20:17:50 +02:00
flo
3d24b1d635 CliffTowns 2022-03-29 12:52:08 +00:00
jh0l
991cfcaa47 feat: 🌐 add i18n for trade amount input placeholder 2022-03-27 20:24:20 +02:00
DaforLynx
e936a27d40 Small sound fixes 2022-03-15 16:23:10 +00:00
Imbris
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
DaforLynx
7b6f424bb0 Loud rivers 2022-03-13 07:47:23 +00:00
DaforLynx
123fee2707 Fix swim sfx, fix glider sfx, add glide sfx 2022-03-13 05:44:07 +00:00
Isidor Nielsen
a5ab36e6b5 Map marker fixes 2022-03-07 12:16:04 +00:00
DaforLynx
32434ec840 Sorry Rarnage 2022-03-04 10:36:03 -08:00
Sam
89bf529a5e Addressed review comments 2022-03-03 01:12:40 -05:00
Sam
f5e0cb0045 Addressed review comments 2022-03-03 01:11:18 -05:00
Sam
5a60562eee Addressed review comments 2022-03-03 01:11:16 -05:00
Monty Marz
855733bdcb tiny tweak 2022-03-03 01:11:09 -05:00
Sam
0542e46e7d Lighting works now hackily 2022-03-03 01:11:01 -05:00
Monty Marz
82def16969 visuals 2022-03-03 01:11:00 -05:00
Sam
c6dc96b795 Settings button to turn off weapon trails. 2022-03-03 01:10:59 -05:00
Sam
f4abe4f275 More tweaks 2022-03-03 01:10:58 -05:00
Sam
b558331b32 Finishing touches 2022-03-03 01:10:55 -05:00
Sam
5018a9f476 Game now runs, still doesn't work 2022-03-03 01:10:53 -05:00
Sam
0794f980fe Mostly snaked through another rendering pipeline 2022-03-03 01:10:47 -05:00
Christof Petig
f347b9de11 Diversify price calculation for items by using multiple categories per item. 2022-03-03 02:32:34 +00:00
Isidor Nielsen
bd8a7a0506 Better rocks 2022-03-02 16:28:04 +00:00
Imbris
4aa89fd6cc Merge branch 'unvariant/center_item_drops' into 'master' 
Center item drops

See merge request veloren/veloren!3232
 2022-02-27 02:07:30 +00:00
ninefox
329051c6df removed extra fields from item_drop_manifest.ron 
added TODO about applying non-random rotations in load.rs
 2022-02-26 10:13:04 -08:00
Imbris
08f67a335f Add experimental shader option that lowers glow strength for lights near the camera 2022-02-26 00:26:42 -05:00
Marcel
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
Marcel
6506a97dcd Merge branch 'zesterer/enable-site2-towns' into 'master' 
Enabled site2 towns by default

See merge request veloren/veloren!3206
 2022-02-20 14:02:53 +00:00
Marcel
df7cd2da1a Merge branch 'isse/shared-waypoints' into 'master' 
Shared and persistent waypoints

See merge request veloren/veloren!3162
 2022-02-20 10:10:18 +00:00
Isidor Nielsen
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
Marcel Märtens
e2648f6733 apply changes from MR!2904 2022-02-20 10:18:24 +01:00
Marcel
d463b67ef4 Merge branch 'zesterer/release-map' into 'master' 
Added location system, switched to release map

See merge request veloren/veloren!3213
 2022-02-17 16:31:01 +00:00
Monty Marz
9ca1693ef8 New login-screen bg image 2022-02-17 16:08:37 +00:00
Joshua Barretto
b786570470 Added location system, switched to release map 2022-02-17 14:51:59 +00:00
Treeco
90fbadbd03 Fix ember z fighting, remove ember sway 2022-02-15 23:05:20 +00:00
Joshua Barretto
00b003a23c Enabled site2 towns by default 2022-02-15 19:01:43 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master' 
Gnarlings

See merge request veloren/veloren!3194
 2022-02-15 00:22:37 +00:00
Sam
f30e879cf5 Clippy fixes 2022-02-14 17:23:15 -05:00
Monty Marz
900fff7ba9 small UI fixes, new haste buff icon 2022-02-14 19:24:59 +01:00
Imbris
46c35f3376 Merge branch 'unvariant/render_item_drops' into 'master' 
Render item drops instead of placeholder textures

See merge request veloren/veloren!3175
 2022-02-14 02:09:45 +00:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
Ibrahim Beladi
17d8baa3d9 kick start Arabic language (i18n) 2022-02-13 23:44:52 +00:00
Bingen Galartza Iparragirre
d2da5c18be Add initial Basque language translation 2022-02-13 22:00:53 +01:00
Jonathan Berglin
dfb8d37a38 Update swedish translations 2022-02-13 20:39:54 +00:00
UncomfySilence
a0d43cb21d further balance changes 2022-02-13 10:35:19 +01:00
Sam
2e6610314c Balance tweaks 2022-02-13 00:39:46 -05:00
Monty Marz
c7ce2b773c new icons 2022-02-12 22:46:34 +01:00
Crow (Austin Bowers)
78ec15981d Added Dungeon Song 2022-02-12 12:38:10 +00:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
Sam
bf7e84c6ae Initial particle work 2022-02-10 14:58:37 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
jshipsey
0c788997a4 anims 2022-02-10 14:58:34 -05:00
Sam
fcb0f8d8f0 Wood golem attacks and ai 2022-02-10 14:58:32 -05:00
Sam
e044bf5091 Mandragora attacks and ai 2022-02-10 14:58:32 -05:00
Sam
f1801560fa Deadwood ai 2022-02-10 14:58:31 -05:00
Sam
82c976919e Darts are now darts. 2022-02-10 14:58:29 -05:00
Sam
40bb74c42f Gnarling stalker AI 2022-02-10 14:58:28 -05:00
Sam
e1f164d099 Initial AI for gnarling logger/mugger. 2022-02-10 14:58:27 -05:00
James Melkonian
3a8a0d9c53 Cavern systems under gnarling fortifications 2022-02-10 14:58:24 -05:00