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 trees #52

Merged
merged 130 commits into from
Mar 5, 2024
Merged

Add trees #52

merged 130 commits into from
Mar 5, 2024

Conversation

snipercup
Copy link
Collaborator

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

  • Add tree, pine tree and willow tree. I used Blender to make the sprites. They are as big as a block at 100x100 pixels
  • Decorated some maps with 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
Rotation is saved and loaded properly
e261156
@snipercup
proper furniture save load rotation
21e2fe1
@snipercup
Remove commented out code
b702eaf
@snipercup
Initial item editor, sprites
6e5cbeb
@snipercup
First item created
6b4a6ca
@snipercup
Add height width stack properties
4d816d0
@snipercup
Add current items
657e978
@snipercup
Items are loaded from json data
53c2a9b
@snipercup
Basic inventory window
3066dbe
@snipercup
Inventory window basic functionality
d92cb17
@snipercup
Dynamic list of containers in proximity, inventory window
a4bf510
@snipercup
Update gloot
61c24b9
@snipercup
Add some tabs to the item editor
1a06644
@snipercup
Add pistol and rifle json in item editor
160ec24
@snipercup
Magazine and bullet json
b3880ec
@snipercup
Weapon can be equipped
b1ecc20
@snipercup
start implementing dual wielding
66da0a7
@snipercup
Basic dual wielding
134fec6
@snipercup
two handed weapons clear the other hand slot
3888d22
@snipercup
Switch to list based inventory instead of grid
cd84ae2
@snipercup
Fix inventory window layout
e85bf08
@snipercup
Add volume to item editor
06ad207
@snipercup
Change player sprite, apply rotation
0931938
@snipercup
Slopes are slopes instead of blocks
0879cc4
@snipercup
Add rocky hill map, json function
3591084
@snipercup
Add tree, pinetree, willowtree
c0e2acf
@snipercup snipercup mentioned this pull request Jan 26, 2024
Merged
@snipercup snipercup marked this pull request as ready for review March 5, 2024 15:51
@snipercup snipercup merged commit c37f303 into Khaligufzel:main Mar 5, 2024
@snipercup snipercup deleted the add-trees branch March 5, 2024 15:51
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