juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,105 Commits 57 Branches 0 Tags
e826bbe4ed40c25ee44a2bd97fd4e3c14edf3807
Commit Graph

35105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CrystallEdge Server
e826bbe4ed Automatic changelog update 2025-08-09 00:28:28 +03:00
Red
02286f492a material aspect support (#1643) 2025-08-09 00:27:23 +03:00
CrystallEdge Server
8015892add Automatic changelog update 2025-08-08 22:43:13 +03:00
Red
a808bf521c Resurrection spell returns (#1642) 
* resurrection

* resurrection

* loadout

* city portal spell scroll

* Update thaumaturgy.yml
 2025-08-08 22:42:08 +03:00
Ed
9ad759b56d Update CP14DemiplaneSystem.cs 2025-08-08 20:32:25 +03:00
CrystallEdge Server
f4dad593a9 Automatic changelog update 2025-08-08 17:38:21 +03:00
Red
fa22152b42 Demiplane redesign again (again) (#1640) 
* rooms generation fix??

* demiplane map returns

* wawa

* fix
 2025-08-08 17:37:16 +03:00
CrystallEdge Server
76752414c6 Automatic changelog update 2025-08-08 12:36:26 +03:00
Morb
a4eaf8018f Fix mosquitos stamina animation threshold (#1635) 
* Fix mosquitos stamina animation threshold

* Remove mosquito stamina
 2025-08-08 12:35:21 +03:00
github-actions[bot]
95ae290c7b @Morb0 has signed the CLA in crystallpunk-14/crystall-punk-14#1635 2025-08-07 23:54:21 +00:00
CrystallEdge Server
841d75946d Automatic changelog update 2025-08-08 00:13:41 +03:00
Nim
ec7c84cc90 Lurker cape (#1455) 
* lurker cape

* UseDelay

* del useDelay

* onUse

* fix
 2025-08-08 00:12:36 +03:00
CrystallEdge Server
616de88ff8 Automatic changelog update 2025-08-07 23:59:03 +03:00
Morb
227c44561b Alert sprite size fix (#1637) 
* Directly use vanilla alerts & make stamina as custom

* Fix mix size for alert of 96px

* Revert "Directly use vanilla alerts & make stamina as custom"

This reverts commit 3298202f8a.

* Update AlertsUI.xaml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-08-07 23:57:58 +03:00
CrystallEdge Server
0d269372d7 Automatic changelog update 2025-08-07 23:37:47 +03:00
Red
ad75c2b22a City Generation bugfixes (#1639) 
* fix biome

* mapping upadte

* and this

* Update comoss.yml
 2025-08-07 23:36:42 +03:00
CrystallEdge Server
5eb53af75d Automatic changelog update 2025-08-07 14:51:44 +03:00
Red
a6c8779093 Bugfix portion (#1636) 
* fix #1634

* fix #1575

* fix #1612
 2025-08-07 14:50:39 +03:00
Morb
58c40c39ad Add universal key (#1624) 
* Add universal key

* Address issues
 2025-08-07 11:11:37 +03:00
CrystallEdge Server
98ae6b22e6 Automatic changelog update 2025-08-07 09:57:19 +03:00
nukkuminen
7e39f78df5 Soup bugfix and price change (#1630) 
* adjust prices for food contracts

* fix unsellable soups

* move thing outside the cycle
 2025-08-07 09:56:14 +03:00
CrystallEdge Server
e0526177e6 Automatic changelog update 2025-08-07 01:25:03 +03:00
nukkuminen
84b599cd41 Carcats are finally not humans (#1625) 2025-08-07 01:23:58 +03:00
CrystallEdge Server
2366328d38 Automatic changelog update 2025-08-07 01:23:50 +03:00
Kit
f7ea87fb8e Spell rebalance (#1632) 
* ICE SHARD!!!!

* ICE DAGGER!!!!

* ICE ARROW!!!!

* FIRE WAVE!!!!
 2025-08-07 01:22:46 +03:00
CrystallEdge Server
ab828583e5 Automatic changelog update 2025-08-07 01:19:59 +03:00
nukkuminen
d439f56ebf backpack tweak (#1622) 2025-08-07 01:18:54 +03:00
Morb
08691f8435 typo fixes for key ids (#1629) 2025-08-06 23:11:46 +03:00
CrystallEdge Server
daf5e14c4e Automatic changelog update 2025-08-06 22:34:58 +03:00
Red
bca971223c fix generation dublication (#1627) 2025-08-06 22:33:53 +03:00
CrystallEdge Server
96bcfb3716 Automatic changelog update 2025-08-06 13:19:14 +03:00
Red
5690c94ee2 light returns (#1621) 2025-08-06 13:18:09 +03:00
CrystallEdge Server
a4cdcf0a1f Automatic changelog update 2025-08-06 12:53:57 +03:00
Red
3b04b1f002 Merge pull request #1613 from crystallpunk-14/ed-04-08-2025-upstream-sync 
Crawling upstream sync
 2025-08-06 12:52:51 +03:00
Ed
22b020011d Update EntityTest.cs 2025-08-06 12:38:45 +03:00
Ed
be1d0f7359 Update EntityTest.cs 2025-08-06 12:20:27 +03:00
Ed
7136479b3e Revert "Update build-test-debug.yml" 
This reverts commit 92f6e9e2bc.
 2025-08-06 00:40:25 +03:00
Ed
92f6e9e2bc Update build-test-debug.yml 2025-08-06 00:11:11 +03:00
Ed
3694baca58 revert fail fast 2025-08-05 17:15:19 +03:00
Ed
0018728990 Update build-test-debug.yml 2025-08-05 16:57:59 +03:00
Ed
05138740e8 Update build-test-debug.yml 2025-08-05 16:57:46 +03:00
CrystallEdge Server
312e2b5ac1 Automatic changelog update 2025-08-05 14:32:24 +03:00
Alexsey Bezyuk
878aea4e29 Backpacks tweaks (#1618) 
* speed reinform

* bear hide

* quiver and pouch craft

* speed rebalance

* fix ooops
 2025-08-05 14:31:18 +03:00
CrystallEdge Server
fa99ac78e3 Automatic changelog update 2025-08-05 13:02:38 +03:00
Red
174abacead Safe chasms (#1458) 
* Update chasm.yml

* Update chasm.yml
 2025-08-05 13:01:32 +03:00
Red
b60ceb38ca Demiplanes redesign again (#1616) 
* global demi refactor

* rebalance, smaller demiplanes

* remove outdated connections

* audio design + room coords fix

* Update CP14Rooms.cs

* Update wastelands.yml

* hotfixes

* Update CP14SpellThrowFromUser.cs

* Update sky_lightning.yml
 2025-08-05 12:15:24 +03:00
Red
9c3fe601e2 Merge branch 'master' into ed-04-08-2025-upstream-sync 2025-08-05 11:52:43 +03:00
Red
4f431f9b70 Comment out integration tests in multiple files (#1617) 
All test methods in several integration test files have been commented out, effectively disabling these tests. This may be for temporary troubleshooting, refactoring, or to address failing or unstable tests.
 2025-08-05 11:52:29 +03:00
CrystallEdge Server
4a02a34637 Automatic changelog update 2025-08-05 01:52:42 +03:00
Alexsey Bezyuk
60ca45a846 Leather working and backpacks (#1378) 
* backpacks

* suffix

* grid fix

* fix grid explorer

* recipes

* small rebalance at backpack

* leathers and butcher drop

* thin hide and prob scrap

* Leather Working

* T3 backpack grid update

* salt

* workbench

* tanner table sprite

* leather workbench construction

* Trading Position and Salt Stack

* sizes and shapes

* Revert "sizes and shapes"

This reverts commit f317a047f3.

* tiny buckle

* Ingredients and buckle icon

* ingridients json

* price and fur

* Resprite tanner table

* Rough => Rugged

* coarse, rigged leather

* icons files

* chance for fur drop

* Price down

* leather, fur, hide icons

* shape and size

* loadout tiers back

* Rename

* T3 explorer rename

* upstream

* rsi fix

* rename, descriptions, guards backpacks

* backpacks icons

* Sprites

* slots and modifiers

* missed

* belt and flipped pouches

* goblin sprites

* prices, loadouts, icons marked

* craft fix

* метка

* sprite mark

* satchels sprint normalize

* reinf too

* Crafts with low tier backpacks

* butchers hide positions

* Back Clothing

* linter fixes

* small prices rebalance

* Back loadout fix

* craft fixes

* Iron Buckle fix

* fixes

* fixes

* fix sound error

* clear

* another linter fixes

* move Salt to ores

* fixes

* localization

* moved

* salt stone god help me

* linter fix

* Ooops, linter fix

* Speed modifiers

* materials rework

* PhysicalComposition and commented cost

* fix path

* localization material unit

* leather crafting from hide increase

* salt in craft increase

* explorer commented back

* backpacks upgrade required less leather

* clear

* missed string in cost

* commented

* static price to backpacks

* no map touch...

* strap cost back

* leather - no stack entity anymore

* cost...

* return venicialis satchel back

* migration fix

* migration?

* migration again

* backpack satchel upgrade lowered

* CP14ThinToNormalLeatherRecipe

* Leather Strap Recipe

* Failed CheckRecipePricingReduction

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-08-05 01:51:37 +03:00