Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev/beta into dev/alpha #17

Merged
merged 74 commits into from
Nov 18, 2023
Merged
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
7f20081
small siphoning ui fixes, siphoning description change and adding tot…
ZigguratV Aug 24, 2023
33f10f4
get rid of debug things
ZigguratV Aug 24, 2023
72ba865
improve description
ZigguratV Aug 25, 2023
49d31e3
Merged in feature/spaceport-cherrypick (pull request #1227)
bloodrizer Sep 4, 2023
57ef510
Fix that deltagrading would fail if noConfirm was false
Brent-Call Sep 4, 2023
3897c8d
Fix prices of Spaceport building
Brent-Call Sep 4, 2023
bf61dc8
Fix that Warehouse effects didn't work
Brent-Call Sep 4, 2023
76eb528
Tweak descriptions a bit
Brent-Call Sep 4, 2023
9876340
Add back in the part where spaceports affect space storage
Brent-Call Sep 4, 2023
b8e60ef
Update test to check for proper price
Brent-Call Sep 4, 2023
6e6eabb
Update test to check for proper price
Brent-Call Sep 4, 2023
6eb2428
Ugly hack for spaceport dependency ordering
Brent-Call Sep 4, 2023
852a6a6
Merged in deltagradeFix (pull request #1228)
Brent-Call Sep 4, 2023
a1bcdca
Merged in master (pull request #1225)
ZigguratV Sep 16, 2023
46ed394
Merged in chore/tabindex (pull request #1230)
bloodrizer Sep 27, 2023
0150a8c
Add automation description to Oil Well
Brent-Call Oct 2, 2023
efb1bcf
Minor tweak to line break on Temporal Accelerator
Brent-Call Oct 2, 2023
7165764
Add automation description for calciner
Brent-Call Oct 2, 2023
ff3f80e
Add automation description to Factory
Brent-Call Oct 2, 2023
3161c2c
Add automation description to Reactors
Brent-Call Oct 2, 2023
df6ac97
Add automation description to Temporal Press
Brent-Call Oct 2, 2023
691277f
Add automation description to Chrono Furnace
Brent-Call Oct 2, 2023
22b1618
Add automation description to Steamworks
Brent-Call Oct 2, 2023
3f29afc
Don't show "automation disabled" message if it's not unlocked yet
Brent-Call Oct 2, 2023
d246716
Fix errors when unresearching certain upgrades
Brent-Call Oct 2, 2023
bdf6ab5
Tooltip updates always fetch latest description
Brent-Call Oct 2, 2023
cb8156a
Merged in automationDescriptions (pull request #1231)
Brent-Call Oct 4, 2023
9c40005
tweaking spaceport scaling
bloodrizer Oct 11, 2023
a41fc25
fix unit test
bloodrizer Oct 11, 2023
8c99d1b
reducing spaceport effect even further
bloodrizer Oct 11, 2023
07ab27a
Merged in spaceportBalancing (pull request #1233)
Brent-Call Oct 21, 2023
41a0487
Merged in master (pull request #1234)
ZigguratV Oct 25, 2023
88fa5ba
Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752…
ZigguratV Oct 28, 2023
1a1a905
Merged in dev/beta (pull request #1238)
ZigguratV Oct 28, 2023
2caf901
Merged in dev/beta (pull request #1240)
ZigguratV Oct 28, 2023
c9f6601
Merged in feat/move-queue-items (pull request #1236)
peter7z Oct 28, 2023
4d460e4
Merged in bsk/emptySky (pull request #1229)
plcp Oct 29, 2023
094e8c5
Squashed commit of the following:
bloodrizer Oct 29, 2023
64b1740
Squashed commit of the following:
bloodrizer Oct 29, 2023
93d4f18
Merged in feat/move-queue-items (pull request #1242)
peter7z Oct 29, 2023
89688e7
Merged in master (pull request #1244)
ZigguratV Oct 29, 2023
7e38fd6
Merged in dev/beta (pull request #1243)
ZigguratV Oct 29, 2023
e056cd2
safety switches
bloodrizer Oct 29, 2023
309eeb7
Merge branch 'dev/beta'
bloodrizer Oct 29, 2023
fe4ee03
switching redhift queue off for mainline
bloodrizer Oct 30, 2023
41fab88
Merged in fixQueueRedshift (pull request #1245)
Brent-Call Oct 30, 2023
0774de3
Create main.yml
bloodrizer Nov 3, 2023
8698380
Update main.yml
bloodrizer Nov 3, 2023
ffcf914
CICD - update pipeline to include RSA key
bloodrizer Nov 3, 2023
2560830
Speed up tests by ~10x
Brent-Call Nov 9, 2023
df08ed7
Update toggle automation links even if there are 0 of the building
Brent-Call Nov 10, 2023
802a967
Tech: 'Construction' increases queue cap by 1
SilenceFactor Nov 10, 2023
dc64d18
Merge pull request #8 from SilenceFactor/contructionqueue
bloodrizer Nov 11, 2023
7a5a5fd
Merge pull request #6 from Brent-Call/dev/beta
bloodrizer Nov 11, 2023
b53a757
Merge pull request #4 from Brent-Call/optimizeChallengeTests
bloodrizer Nov 11, 2023
7f5465f
Update main.yml
bloodrizer Nov 11, 2023
dc18b43
Merge pull request #9 from nuclear-unicorn/master
bloodrizer Nov 11, 2023
583fa3b
Add tooltips to items in the queue
Brent-Call Nov 11, 2023
60bc224
Make space missions, upgrades, & techs properly drop off the queue if…
Brent-Call Nov 11, 2023
e7e39fe
Building tooltips will update whenever the queue updates
Brent-Call Nov 11, 2023
686c43b
Fix error when using SHIFT to queue multiple items from an empty queue
Brent-Call Nov 11, 2023
e347cac
Update queue labels when a building is deltagraded
Brent-Call Nov 11, 2023
ebe7130
Refactor the callback used in buyItem
Brent-Call Nov 14, 2023
3fe4756
Add support for skipping items based on reason
Brent-Call Nov 14, 2023
326cffe
Add more detail to callback reasons
Brent-Call Nov 14, 2023
1fbf784
Add some documentation
Brent-Call Nov 14, 2023
bfd9666
Make the "event" parameter optional
Brent-Call Nov 14, 2023
9b7aaa8
Hydroponics display bug solution
SilenceFactor Nov 16, 2023
5c81784
Merge pull request #14 from SilenceFactor/bugfix
bloodrizer Nov 16, 2023
7d00fb8
Properly reset the state of the queue in between tests
Brent-Call Nov 17, 2023
700b0c1
Add unit tests
Brent-Call Nov 17, 2023
4f7355e
Allow queueing Fix Cryochamber only when it could also be done manually.
Brent-Call Nov 17, 2023
796bda2
Merge pull request #13 from Brent-Call/buyItem_callback_refactor
Brent-Call Nov 18, 2023
9e206e8
Merge branch 'dev/alpha' into dev/beta
Brent-Call Nov 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CICD - update pipeline to include RSA key
bloodrizer authored Nov 3, 2023
commit ffcf91469ab6351400d76522c28609c35046052a
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy
name: KG Deploy code
on:
push:
branches: [ "master", "dev/*" ]
@@ -34,6 +34,7 @@ jobs:
with:
username: ${{ secrets.KG_SSH_USER }}
host: ${{ secrets.KG_SSH_HOST }}
key: ${{ secrets.KG_SSH_KEY }}
script: /var/www/kittensgame.com/html/deploy.sh