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.

Sign up for GitHub

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

Jump to bottom

Jibauni #2

Open
wants to merge 257 commits into
base: master
Choose a base branch
from
Open

Jibauni #2

wants to merge 257 commits into from

Conversation

TheGiraffe3
Copy link

@TheGiraffe3 TheGiraffe3 commented Jul 20, 2024 •
edited
Loading

For running checks. Will be closed when the initial Jibauni things are done, but I'm happy for people to suggest changes here.

TheGiraffe3 and others added 30 commits June 20, 2024 11:25
@TheGiraffe3
Merge branch 'endless-sky:master' into Jibauni
4fd5bee
@TheGiraffe3
Split the Jibauni Basics and Jibauni Advanced shipyards
7309cb5
@TheGiraffe3
First part of planets and systems
13b37cf
@TheGiraffe3
Finish map planets and systems
2ae1174
@TheGiraffe3
Changes
7cb8b27 
Fix Rebel Jibauni planets and systems
Switch to traditional haze methods
@TheGiraffe3
Attributes
054ee84
@TheGiraffe3
Ordering
065f090 
Also nerf the Osra bunks
@TheGiraffe3
First Contact Fixes
0ed473a
@TheGiraffe3
Merge branch 'endless-sky:master' into Jibauni
720e808
@TheGiraffe3
Larajal sprite
b11ce81
@TheGiraffe3
Typo fixes
f18ce79
@TheGiraffe3
Fix Quotation Marks
69c065c 
Co-authored-by: TheTesterManiac <172621837+BZENDSKY@users.noreply.github.com>
@TheGiraffe3
Outfit Space
964195d
@TheGiraffe3
Shipyard fixes
0a237d4
@TheGiraffe3
Larajal Sprite
4474a99 
Remove thruster slots
@TheGiraffe3
Latbaliday, and Larajal changes
90d9f8b
@TheGiraffe3
Remove Opal Glaive
4d9bef6 
This wasn't being used
@TheGiraffe3
Longer Planet Descriptions
9f53a66
@TheGiraffe3
Remove custom hyperdrives
d48f4f0
@TheGiraffe3
And image
fb41593
@TheGiraffe3
Mass update and faster turn
a944a24
@TheGiraffe3
Let ships and outfits be in Diba Station
f70937b
@TheGiraffe3
Firing Fuel
47cfdb6
@TheGiraffe3
Changes
d104143 
The Jibauni no longer like pirates.
The Jibauni carried ships have slowing resistance.
Large Sheragi and Diba fleets have variants with lots of fighters.
There is a Jibauni Fighter Patrol fleet.
@TheGiraffe3
Changes
4d8fa50 
Fix fighter naming.
Switch back to the Dagger and Finch sprites for now.
@TheGiraffe3
Content Style Fixes
55fdf87
@TheGiraffe3
Continue working on style
9686eda
@TheGiraffe3
These Style Checks...
c656bf1
@TheGiraffe3
More Checks
6e772be
@TheGiraffe3
Done?
d75a355
@TheGiraffe3
Zarwal Turret finalized sprite
4e8a07a
@TheGiraffe3
Ship descriptions
5985004
@TheGiraffe3
Merge branch 'master' into Jibauni
3625192
@TheGiraffe3
Images for the Lasers
abdd1d1
@TheGiraffe3
Bugfixes
7263931
@TheGiraffe3
More bug fixes
3f0bd58 
This should hopefully resolve everything I can do.
@TheGiraffe3
Sprite for the Lilsa Anti-Missile
3de4b44
@TheGiraffe3
Lilsa Update
35e263d
@TheGiraffe3
Daltaq Generator Sprite
7d46c72
@TheGiraffe3
Merge branch 'master' into Jibauni
b98509b
@TheGiraffe3
Sprites for the rest of the generators
7fef09d
@TheGiraffe3
Merge branch 'Jibauni' of https://github.com/Alrodel/endless-sky into…
f77ef66 
… Jibauni
@TheGiraffe3
Minjal
def6933
@TheGiraffe3
GBR image
7f054eb
@TheGiraffe3
Bunk
7dbe64d
@TheGiraffe3
Update copyright
a8eec14
@TheGiraffe3
Rukjay Missile sprite
9646c07
@TheGiraffe3
Ruksay update
bd437a9
@TheGiraffe3
Merge branch 'master' into Jibauni
5e1e087
@TheGiraffe3
Rukjay Missile Launcher image
1ff5a50
@TheGiraffe3
Ruksay Missile Launcher image
ee62d80
@TheGiraffe3
Remove the Ridtab Cooling
4604376
@TheGiraffe3
Copyright fix
85fd9b3
@TheGiraffe3
Jibauni Fuel Pod image
5cc7572
@TheGiraffe3
Altaedin Laser image
05e120a
@TheGiraffe3
Ramscoop and shield generator images
e342514
@TheGiraffe3
Merge branch 'master' into Jibauni
16fd6a6
@TheGiraffe3
Rename landscape images which are being used
d8d7b4d
@TheGiraffe3
Two new planets
f4fcc9a
@TheGiraffe3
New planets, with landscape images to match
db7bb93
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reticent-rem reticent-rem reticent-rem left review comments

Assignees

@TheGiraffe3 TheGiraffe3

Labels
enhancement New feature. sprite help requested It would be nice to have help with sprites, but this is not entirely necessary.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TheGiraffe3 @reticent-rem