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

Add the rest of the terrain tiles #39

Merged
merged 95 commits into from
Mar 5, 2024
Merged

Add the rest of the terrain tiles #39

merged 95 commits into from
Mar 5, 2024

Conversation

snipercup
Copy link
Collaborator

This requires #38 to work. I will publish this PR as a draft to make sure #38 gets merged first.

  • Adds the rest of the tiles that already had their sprite created, but lacked the json data
  • Some improvements to the terrain tile editor

Here you can see some of the added tiles, about 100 of them:
image

@snipercup
Start loading files into editor
ec266db
@snipercup
Add navigation from main menu
e9f5cc4
@snipercup
Now able to create a new json file
b2df2a1
@snipercup
More work on loading mapfiles
b24fd03
@snipercup
Can now save and load maps in editor
50f510d
@snipercup
Load custom levels into main menu
cf5743a
@snipercup
Fix scaling issue
0676fe3 
When the materials are generated, set the proper uv scaling so they are correctly visualized in-game.
@snipercup
Fix no scroll bug
4d92eea 
This fixes the situation where if two map editors are opened, only the last one receives input from the scroll wheel
@snipercup
Added terraintile editor
94de13f
@snipercup
Tile saving and loading works
a869594
@snipercup
Improved tile editor
5d62db0 
Improved saving loading, added duplicate and delete buttons, icons
@snipercup
Contenteditor adjusted sizing, tab control
cb77aed
@snipercup
Added categories to map editor
306b9f8
@snipercup
Polishing
af4e1f2
@snipercup
Remove comments
eebe6d3
@snipercup
Starting POC
9b7c849
@snipercup
Infinite panning now possible
d5836a2
@snipercup
Now it's seamless
16d4ad9
@snipercup
Cleanup overmap script
32e402a
@snipercup
Refactor file names json function
9c1cfa0
@snipercup
Switch level from overmap
8e2f9d1
@snipercup
Can switch levels in-game
866b2c4
@snipercup
Add gui elements to overmap
a6e0691 
Add name and description labels to show info on a tile
@snipercup
Create gamedata singleton
c513d77
@snipercup
Refactor some json loading
2b11e38
@snipercup
overmap is consistent
adf11f5 
Overmap chunks will stay consistent even after changing scenes.
@snipercup
Initial version of save load
6ae5f43
@snipercup
remove editor complaints
3c6e92d
@snipercup
Added the selectable sprite custom widget
e2f8601
@snipercup
Add mobeditor, refactor contentlist
a459a66
@snipercup
Preserve player inventory between maps
e89e5d5
@snipercup
Preserve player inventory across saves
f0ba3d5
@snipercup
Enemy corpse loot is saved and loaded
8263876
@snipercup
Save and load player health and death
cde03db
@snipercup
add furniture sprites
5c85c8f
@snipercup
Minor fix on existing widgets
2165638
@snipercup
Initial furniture editor
04a5ba5
@snipercup
Finalize furniture editor
2faa884
@snipercup
Paint furniture in map editur
ba5a692
@snipercup
add furniture to game
9b3c2ce
@snipercup
Basic physics for furniture
48f21e9
@snipercup
Adjust layers
5a4326d
@snipercup
Save and load furniture
d45d812
@snipercup
Create map icons
6222bbf
@snipercup
fix mapeditor bugs
e1848e7
@snipercup
Initial tactical map editor
ed88095
@snipercup
Adding tacticalmap infrastructure
a2233d9
@snipercup
Tactical map editor can write file
4cee329
@snipercup
Tacticalmap loads ingame
7f8e3d9
@snipercup
Tactical maps are saved and loaded
b72e4b0
@snipercup
fix tileeditor bugs
3381a2f
@snipercup
Add tiles, enable tab navigation
ce4c6b5
@snipercup
snow and toxic waste tiles
ede35fa
@snipercup
More tiles, kitchen, rock
73470e7
@snipercup
Delete old tiles, add new ones
cb53e17
@snipercup
Add the last tiles
486853d
@snipercup snipercup mentioned this pull request Jan 17, 2024
Merged
@snipercup snipercup marked this pull request as ready for review March 5, 2024 15:47
@snipercup snipercup merged commit 18d5f28 into Khaligufzel:main Mar 5, 2024
@snipercup snipercup deleted the update-terraintile-editor branch March 5, 2024 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@snipercup