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

Feature/druid styles #33

Merged
merged 23 commits into from
Jan 11, 2020
Merged

Feature/druid styles #33

merged 23 commits into from
Jan 11, 2020

Conversation

Insality
Copy link
Owner

@Insality Insality commented Dec 5, 2019 •
edited
Loading

Trying to make druid styles...
Description later

Fork from druid-component (#32)

@Insality
add kenney assets and start gui screen
f447afb
@Insality
Main page on kenney example
ffb6deb
@Insality
main page polish
528170f
@Insality
work on main example page
6d8d0e8
@Insality
change lang button
6f37a1e
@Insality
add simple checkbox component
7917a08
@Insality
add simple slider component
6cebc9d
@Insality
add checkbox group component
c048224
@Insality
updates in new components
14e0680
@Insality
update collection to 162 defold
39b5f1c
@Insality
update checkbox_group component
ae9c580
@Insality
add radio_group component
4a2458c
@Insality
add simple blocker component
78807d7
@Insality
Merge branch 'develop' into feature/druid-example
280b57c 
# Conflicts:
#	druid/base/checkbox_group.lua
#	druid/druid.lua
@Insality
Rename helper.get_node -> helper.node
e45dce1
@Insality
Move const to const.lua
f8a3b6f
@Insality
Update ldoc comments
88a37f7
@Insality
Generate ldoc
da27d6e
@Insality
Add druid with context, get component druid as helper.get_druid(context)
b8dec48
@Insality
Close TODO on self context
89933df
@Insality
Add first implementation of druid styles (only button)
efef4d1
@Insality Insality changed the base branch from master to develop December 5, 2019 20:54
@Insality Insality changed the title WIP: Feature/druid styles Feature/druid styles Jan 11, 2020
@Insality Insality merged commit 9cddb17 into develop Jan 11, 2020
@Insality Insality deleted the feature/druid-styles branch January 11, 2020 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AGulev AGulev AGulev approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Insality @AGulev