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
10,573 Commits 151 Branches 18 Tags 2.1 GiB
d1e1de3b14
Commit Graph

10573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
floppy
ff4c0460e6 - add Polaris Lantern, created by Gemu and Uncomfy for Christmas 2021-12-20 18:06:21 +00:00
floppy
aa81f2522d - add Polaris Lantern, created by Gemu and Uncomfy 2021-12-20 18:06:21 +00:00
UncomfySilence
e70fd8d397 + Added Gemu models 
+ Created manifest files for each
+ Created stats and other needs
+ Changed Event date from (24..=25) to (20..=30)
 2021-12-20 18:06:19 +00:00
UncomfySilence
cd995b5ffe + Added limited event recipe. Can make one diamond with 20 coal. (actual conversion ratio would be around 12.5) 2021-12-20 18:03:52 +00:00
UncomfySilence
d641245388 + Added updated blue_cheese model. 2021-12-20 18:03:52 +00:00
Joshua Barretto
17e7879777 Added surface traction factor 2021-12-20 18:03:52 +00:00
Joshua Barretto
6e97e3179d Slippery ice 2021-12-20 18:03:52 +00:00
UncomfySilence
d6d55764c4 + Created common.loot_tables.calendar.<seasonal_event> directory for special item drop changes or for potential bosses. 
+ Created common.entity.calendar.<seasonal_event> directory for special entities that spawn exclusively during season event.
+ Added lines to world/src/layer/wildlife.rs for the current events underneath nonevent basis.
+ Attempted organization go brrrrrr
 2021-12-20 18:03:52 +00:00
Joshua Barretto
a2ca95af3d Ice cliffs 2021-12-20 18:03:52 +00:00
Joshua Barretto
a2a3a20aad Added ice to cold water 2021-12-20 18:03:52 +00:00
Joshua Barretto
78f76dde83 Added baubles to trees 2021-12-20 18:03:52 +00:00
Joshua Barretto
3ddacb96ab Added christmas snow 2021-12-20 18:03:52 +00:00
Joshua Barretto
e3203080ed Added Calendar for temporal events based on the real-world calendar 2021-12-20 18:03:52 +00:00
UncomfySilence
c2bf1a5345 + Created common.loot_tables.event directory for special item drop changes or for potential bosses. 
+ Made yeti boss have a 5% chance to spawn in snow biomes.
+ New yeti entity has ~28.5% chance to drop 1 to 10 exclusive blue cheese, ~57.1% to drop 1 to 3 coal, and ~14.2% chance to drop 1 diamond.
+ Blue cheese heals 60hp over 20 seconds.
+Blue cheese has item_image_manifest and other necessities completed. (Model is current placeholder until Gemu or Hannibal have approved)
 2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3 Merge branch 'Character-editting' into 'master' 
Character editing

See merge request veloren/veloren!3059
 2021-12-20 15:24:43 +00:00
Joshua Barretto
bd4796144a Merge branch 'ubruntu/hide-zero-armor-stats' into 'master' 
Hide empty stats on item tooltips

See merge request veloren/veloren!3067
 2021-12-20 15:07:38 +00:00
ubruntu
59cb9ea7c2 Hide empty stats on item tooltips 2021-12-20 15:07:38 +00:00
Dr. Dystopia
9b407b8aef Update warning message 2021-12-20 12:33:51 +01:00
Justin Shipsey
db2bd0a90d Merge branch 'snowram/anim-hotreload-fix' into 'master' 
Fixes animation hot reloading (credit to Imbris)

See merge request veloren/veloren!3063
 2021-12-19 10:09:41 +00:00
Snowram
66a5f9fded Fixes animation hot reloading (credit to Imbris) 2021-12-18 20:36:14 +01:00
Dr. Dystopia
1719ce8c16 Format 2021-12-18 15:58:17 +01:00
IsseW
65ab92eb78 button spacing 2021-12-18 15:41:11 +01:00