juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,277 Commits 57 Branches 0 Tags
60737dc36eccfa5c5e9e92e755d32012bc2edff0
Commit Graph

41 Commits

Author SHA1 Message Date
Ed
af182db79e Another assets relicense (#814) 
* TheShuEd assets relicensing

* Max Gab mass relicensing

* omsoyk mass relicensing

* Prazat mass relicense

* Jaraten mass relicensing

* Update meta.json

* jaraten part 2

* finalize

* validation

* unrelated fixes

* Revert "jaraten part 2"

This reverts commit b39ee0cdb9.

* Revert "Jaraten mass relicensing"

This reverts commit 44febae380.

* Revert "validation"

This reverts commit 3d2f388f47.

* Revert "finalize"

This reverts commit 775f21a18d.

* final fix
 2025-01-27 16:03:13 +03:00
Ed
fb604d1e08 fix CLA licensing 2025-01-24 22:02:46 +03:00
A.Ne.
f655f74b03 mithril and lucens (#660) 
* mithril and manarium

* Rename manarium to Lucens

* pointlight to tree

* lucens tile

* Update trees.yml

* logs sprite

* Update trees.yml

* delete acacia tiles, recolor lucen example

* tiles new palette

* Update ores.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* tiles update

* Update tiles.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-12-15 12:53:31 +03:00
Ed
d7d0977eb6 New year preparation (#674) 
* garland

* presents filter

* vladimirs weather

* snowed tilebrick
 2024-12-14 01:01:36 +03:00
Ed
e1f67be2a8 Snowdrifts (#669) 
* snowdrifts

* Update fire.png

* alerts sprite optimize

* Update wooden.png

* stone wall fix
 2024-12-13 16:59:37 +03:00
Ed
191112a8a8 Tampestry (#607) 
* Update T0_cure_heat.yml

* tampestry

* palisade wip
 2024-11-24 18:27:18 +03:00
Ed
d67f7619c4 Edgefication (#590) 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
 2024-11-18 14:40:52 +03:00
Ed
5c4b5d1572 Demiplans expeditions (#523) 
* simple expedition generation

* add simple test key

* expedition map component

* some funny procedural testing

* refactor expeditions from planetbiome to islanddungeons

* some work

* fix: grid dungeon, not map planet dungeon

* unhardcode map components

* finish T1 expedition generation

* Update preset.yml

* indestructable stone

* mob water occlusion

* caves T1 expedition

* Update CP14SpawnExpeditionJob.cs

* Delete shared MissionParams

* rename to demiplans

* pass mapid into job

* demiplan connections

* demiplan exits

* random entry points

* Update config.yml

* some cleanup and renaming

* radius one-time teleport

* rename connections to exitPoint

* merge entry and exit point into rift component

* demipan closing - all rifts deletion

* demiplanEEEEEE

* fixes

* delete floating visuals

* Update CP14DemiplaneTravelingSystem.cs

* intro and outro demiplan music

* rift cores and flashing

* pulling support

* pulling fix + generatordata fix?

* auto destrot demiplans??
 2024-10-31 19:13:44 +03:00
Ed
dacac22663 Marble (#502) 
* marble floor

* fix

* bank wallpaper, marble floor resprite

* marble window

* rename whitebrick wall to marble wall, delete iron walls
 2024-10-21 23:35:06 +03:00
Jaraten
6c08ca60f3 frame & table (#464) 
* frame & table

* rem superfluous sprite

* merge conflict

* duplicate_ID

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-10-01 16:32:14 +03:00
Ed
a92c623672 Fences update (#458) 
* small fences update

* Update wooden_fence.yml

* reparent all fences, fix high fence

* iron grille fix

* migration

* Update migration.yml

* construction recipes

* Update migration.yml

* fix dev map

* Update migration.yml

* Update migration.yml

* Update migration.yml
 2024-09-26 14:57:24 +03:00
Jaraten
693ba93e44 Content pack jr (#457) 
* 24.09.24

* wallpapers

* backpack parenting setup

* goblin backpack

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-09-25 12:31:31 +03:00
Ed
0456d40bef Content pack (#444) 
* cable sprite

* steel plates

* iron wall

* vladimirs resprite

* resprite cables

* cable item

* lv cable finish

* round table

* curtains! (need resprite)

* plates + cucumbers

* more procedural cooking

* some tweaks

* fix test

* пипяу

* finish

* ah

* l

* pip

* some cool

* hide station ai

* revert localization

* Update crates.yml

* Update crates.yml

* red and blue curtains

* Update crates.yml

* Update crates.yml

* fix cupboard

* Update exp_tavern.yml

* fix sliceable recursion
 2024-09-23 14:53:03 +03:00
vladimir.s
8d022dd502 Wooden objects and structures resprite (#436) 2024-09-17 13:06:34 +03:00
Ed
37a4068334 CLA license update (#429) 
* pupu

* Update LICENSE.TXT

* CLA

* CLA!

* Revert "CLA!"

This reverts commit f999e341a1.

* CLA2

* Update rsi.json

* CLA3

* Workbench sublicense
 2024-08-29 18:23:33 +03:00
Skilets
e938b2f9ed Icon (#426) 
* Fix Hud

* skulls wall

---------

Co-authored-by: SkiletsKir <113713080+Skilets@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-28 15:32:22 +03:00
Jaraten
f70e3051ed update update (#403) 2024-08-09 14:08:50 +03:00
Ed
37e0ffa173 Workshop update (#392) 
* kreks spell icons

* vladimirs walls update

* add flora material
 2024-08-05 22:46:22 +03:00
Jaraten
cf6b42d20c Stone-brick wall crushed (#336) 2024-07-28 17:27:24 +03:00
Jaraten
77b1113d5d Walls upd (#333) 
* wewe

* oops

* oooopsss 2
 2024-07-18 16:11:59 +03:00
Jaraten
82f1ed1493 upd cliffs (#320) 
* upd cliffs

* localize

* Update marker_base.yml

* Update entities.ftl

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-09 21:31:36 +03:00
Jaraten
b7e2d66557 wood&paper walls (#299) 2024-07-04 19:46:10 +03:00
Ed
798539899d experimental cliffs (#283) 2024-06-27 14:04:57 +03:00
Jaraten
294f81bd0f resprite stone&red_brick-walls (#265) 2024-06-22 00:17:10 +03:00
Ed
03adbaf851 Tiles update + iron bards (#260) 
* wooden tiles update

* add iron bars

* dirt tile update

* fix foundation tile
 2024-06-21 00:18:47 +03:00
Jaraten
f79c6de912 fix cardboard wall sprites (#250) 
* fix cardboard wall sprites

* То что лень делать тебе, придется делать мне.

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-17 00:40:35 +03:00
Ed
df695cc39b Dirt wall (#223) 
* add dirt wall sprites

* added dirt wall proto

* add dirt material, dirt wall crafting and dirt drop from wall
 2024-06-06 21:06:32 +03:00
Ed
b33a094f65 change licenses (#191) 
* change licenses

* Update rsi-schema.json

* change codebase license

* try make schema

* Create rsi.json

* rga fix
 2024-05-31 00:01:22 +03:00
Ed
18e4e86b21 Ed 19 05 2024 building2 (#161) 
* added wooden planks from wooden logs

* update construction crafts from new wood planks

* Update simple.yml

* add wall frame and wall construction graph

* noSpawn old planks, fix wooden frame layering

* update Jaraten sprites

* add wooden window and restruct files

* fix

* Update wall.yml

* add new walls!

* restruct wallmounts, fix bugs

* door fix

* Update walls.yml

* Update simple.yml
 2024-05-21 00:07:51 +03:00
Ed
acd8f93b36 added Kocherga fences 2024-05-03 21:33:24 +03:00
Ed
6cb97502aa KBAS5 clothing + Jaraten Structures (#120) 
* add barbarian clothes

* add jaraten floors and wall

* locale

* add stonebrick walls and gold\silver ore cave walls

* fix brick black, update cave arena

* Update roundstart.yml

* Update cave-arena.yml
 2024-04-28 22:47:01 +03:00
Ed
1840003e1c update cave wall to high format (#113) 
* high cave wall

* some minor fixes

* Update cave-arena.yml

* Update natural.yml
 2024-04-27 10:02:59 +03:00
Ed
1f9f88883c Content (#110) 
* Add many test walls

* minor bug fix

* fix torch

* add wallmount variation

* final wood wall!

* great sprite clearing + locales

* fixes

* Update bonfire.yml

* Update wallmount_torch.yml

* Update cave-arena.yml
 2024-04-26 11:09:38 +03:00
Ed
b0a11462d6 cave wall sprite fix 2024-04-24 11:39:05 +03:00
Ed
6307c1b1b5 add walls 2024-04-24 11:28:25 +03:00
Ed
f972f3129d update debug walls 2024-04-22 13:37:44 +03:00
Ed
0b4c5bb988 +2 ores 2024-04-18 23:34:45 +03:00
Ed
dc1b38054e add iron and gold ore 2024-04-18 12:53:15 +03:00
Ed
c5b4df22a6 modified cave wall 2024-04-17 20:42:28 +03:00
Ed
9597d6a84a Приподнимаем стены (#68) 
* remake debug wall

* wood wall

* Update walls.yml
 2024-04-07 11:23:10 +03:00
Ed
80958e4d71 Hairs init + move textures to _CP14 folder (#43) 
* move textures to _CP14 folder

* hairs

* maps update
 2024-04-06 10:01:45 +03:00