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
11,596 Commits 151 Branches 18 Tags 2.1 GiB
74a3f4a7dc
Commit Graph

11596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DoctorKompot
0242552492 added mushroom stick, changed apple and apple stick models, made phoenix feather legendary rarity 2021-12-27 03:01:07 +02:00
DoctorKompot
84b85d6ae5 fixed coconut, added apple stick 2021-12-27 03:01:06 +02:00
DoctorKompot
daad02ae60 changed the index from the highlight color of these necklaces, since the voxels were invisible in-game 2021-12-27 03:01:04 +02:00
DoctorKompot
ac15e556f5 added vox files for apple, coconut, collar, mushroom curry and admin tabard, update item image manifest accordingly 2021-12-27 03:01:02 +02:00
DoctorKompot
e5408c69b5 changed color of MF bag to a darker tone 2021-12-27 03:01:00 +02:00
DoctorKompot
d7ddb3ae04 updated bag displays 2021-12-27 03:00:59 +02:00
DoctorKompot
ccc1bdbf1c updated the Common Quality item displays 2021-12-27 03:00:57 +02:00
DoctorKompot
3b6dc4dc50 reverted the previous Common items display changes 2021-12-27 03:00:56 +02:00
DoctorKompot
3c60bd1929 made lanterns slightly brighter, changed lantern color for green and red to match their names, changed display of Common items to fit the item frames of other qualities, updated item image manifest 2021-12-27 03:00:54 +02:00
Imbris
5b2aba80b5 Merge branch 'imbris/opt-entity-sync' into 'master' 
Parallelize loop over regions in entity sync system

See merge request veloren/veloren!3073
 2021-12-26 20:23:01 +00:00
Imbris
e136e606a5 suppress clippy false positive, fmt 2021-12-26 14:40:50 -05:00
Imbris
b255f0ee0f put Client::tick_network function behind feature, remove unnecessary cloning of deleted entity vecs in entity sync, move prepare_send hack that avoids locking during message serialization from send_fallible to send, add job.cpu_status par mode adjustment around parallel section 2021-12-26 12:04:08 -05:00
Imbris
d137ffba63 Update changelog 2021-12-25 19:24:12 -05:00
Imbris
6547a6bf5e Parallelize entity sync loop over regions. 2021-12-25 19:24:12 -05:00
Imbris
9788b144ec Decrease swarm movement speed 2021-12-25 19:24:12 -05:00
Imbris
6023670467 Improvements to swarm clients: space properly for the unclustered case so that regions don't overlap, advance time manually within Client::tick_network since State::tick isn't being called 2021-12-25 19:24:12 -05:00
Imbris
972c8ba41d Add wildlife density modifier to features.ron 2021-12-25 19:24:09 -05:00
Imbris
027f2f5719 Setup client binary that connects to the server with a group of clients positioned and moving in a few different patterns for profiling the server under network load. 2021-12-25 18:14:39 -05:00
Imbris
35086c1626 Merge branch 'imbris/update-toolchain' into 'master' 
Upgrade toolchain

See merge request veloren/veloren!3069
 2021-12-23 18:48:25 +00:00
Imbris
bf48bd5346 update toolchain to nightly-2021-12-19 2021-12-23 13:04:24 +01:00
Joshua Barretto
119c802695 Merge branch 'DaforLynx/new-music-nov' into 'master' 
Music additions

See merge request veloren/veloren!3023
 2021-12-22 11:20:34 +00:00
DaforLynx
e44478736e Music additions 2021-12-22 11:20:34 +00:00
Joshua Barretto
d44b77497f Merge branch 'christmas_tweaks' into 'master' 
Christmas tweaks

See merge request veloren/veloren!3070
 2021-12-21 22:58:41 +00:00
Youssef Fahmy
04a37ba29c Christmas tweaks 2021-12-21 22:58:41 +00:00
Joshua Barretto
824a978cdb Merge branch 'christmas' into 'master' 
Christmas

See merge request veloren/veloren!3047
 2021-12-20 20:23:26 +00:00
Joshua Barretto
1db00eb255 Fixed bad manifest formatting 2021-12-20 19:52:50 +00:00
UncomfySilence
9d76520b91 + Changing the name of spawn_manifest files to avoid clone issue 2021-12-20 18:10:39 +00:00
UncomfySilence
bbd2b611c7 + Reapplying a wildlife.rs fix 2021-12-20 18:10:33 +00:00
UncomfySilence
a4cbfb6942 + fixing wildlife.rs because spelling mistakes and moarrrrr 2021-12-20 18:10:20 +00:00
Christof Petig
f3c1a69b12 make christmas wreaths hang to the wall, not float [ci skip] 2021-12-20 18:09:42 +00:00
Christof Petig
453c4c149e fix more examples and satisfy code quality checks 2021-12-20 18:09:34 +00:00
Christof Petig
2dd63a333e fix economy test [ci skip] 2021-12-20 18:06:58 +00:00
Christof Petig
cbd2a422f3 Add Chrismas wreath (25% chance) and make the towns go wild with illumination 2021-12-20 18:06:58 +00:00
Christof Petig
3edc7b5846 make house decorations correctly depend on Calendar 2021-12-20 18:06:58 +00:00
Christof Petig
8a85d6e6e0 cargo fmt, pass calendar down into building creation 2021-12-20 18:06:58 +00:00
Christof Petig
42ba9212ea move Calendar object into WorldSim 
(needed for Christmas decoration in towns)
 2021-12-20 18:06:58 +00:00
Christof Petig
47a6cf8ee3 Add Sarra_Kitty's Christmas wreath model [ci skip] 2021-12-20 18:06:58 +00:00
Christof Petig
920874146a remove the unintended black pixels at the bottom point [ci skip] 2021-12-20 18:06:58 +00:00
Christof Petig
c695d607d3 revise the snowflake shape [ci skip] 2021-12-20 18:06:57 +00:00
Christof Petig
be1a9050a4 make Christmas decoration unconditional for now 2021-12-20 18:06:57 +00:00
Christof Petig
201101c059 Add glowing christmas ornaments 2021-12-20 18:06:57 +00:00
Christof Petig
f097be4366 correct hanging star orientation 2021-12-20 18:06:57 +00:00
Christof Petig
207943aaa6 The snowflake is less deep than the star 2021-12-20 18:06:57 +00:00
Christof Petig
343ad8dfd9 Add mounting to Ornaments 2021-12-20 18:06:56 +00:00
Christof Petig
a314afdf04 Glowing snowflake model (Xmas decoration) 2021-12-20 18:06:55 +00:00
Christof Petig
1877bd5a57 Moravian Star (Xmas) decoration 2021-12-20 18:06:55 +00:00
Joshua Barretto
3b4fa6b328 Snow for ice 2021-12-20 18:06:53 +00:00
UncomfySilence
065da20812 + Finished hat offsets for all races 
+ Villagers only wear christmas hat
+ Guards wear boreal_warhelm
+ Gave guards christmas color lanterns
+ Grave_robbers now wear hood and hood_dark too while also dropping them at a higher rate than previously.
+ Christmas event now starts at 20th and goes till 30th of december
+ item_image_manifest.ron manifest fix
+ Created a potential boss loot table which allows the player to get the winter_cap, the boreal_warhelm, polaris lantern, and more blue cheese.
+ Updated hood_dark with another index 17 layer to prevent hair clip.
 2021-12-20 18:06:21 +00:00
UncomfySilence
f9b4b55494 + working on hat offset 2021-12-20 18:06:21 +00:00
floppy
40c547c582 - add Polaris Lantern, created by Gemu and Uncomfy for Christmas 2021-12-20 18:06:21 +00:00