Skip to content

Develop #33

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

Merged
bakercp merged 13 commits into from
Oct 26, 2015
Merged

Develop #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c1640d4
Updating info slide.
bakercp Oct 22, 2015
3cefe0c
Documentation and cleanup.
bakercp Oct 22, 2015
427ae05
Updates for 0.9.0.
bakercp Oct 22, 2015
1812e79
Add brush tool back.
bakercp Oct 22, 2015
222b1e4
Add system alerts for common messages.
bakercp Oct 22, 2015
8c1e8a7
Add logging subsystem.
bakercp Oct 22, 2015
cf4f726
Update options for windows.
bakercp Oct 22, 2015
14e01bb
Update changeling.
bakercp Oct 22, 2015
a74fd8e
Update OS X project files.
bakercp Oct 22, 2015
60904a7
Windows keyboard hacks. Not sure why the keys don't match across pla…
bakercp Oct 22, 2015
da22ac3
Update VS2015 project files.
bakercp Oct 23, 2015
6c6e86f
Update for windows / linux.
bakercp Oct 23, 2015
723e7d0
Clean up various debug comments.
bakercp Oct 26, 2015
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
15 changes: 10 additions & 5 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
# Kibio Changelog

## v0.2.2
(2015-10-22)
- Update code to openFrameworks 0.9.0 standards.
- Add initial windows keybinding support.
- Add onscreen logging.
- Add brush.

## v0.2.1 (OS X 10.10 Yosemite Only)
(2015-03-14)

- Using GLFW 3.1
- Remove Ubuntu mouse.

## v0.2.0
(2015-03-14)

- Add Ubuntu mouse image to alleviate GLFW bug in OF Master branch.
- Add layer order management with key bindings (`cmd-[`, `cmd-]`, `shift-cmd-[`, and `shift-cmd-]`) ([#30](https://github.com/kibio/kibio/issues/30)).
- Add Interface with icon buttons ([#24](https://github.com/kibio/kibio/issues/24)).
Expand All @@ -17,9 +22,9 @@
- Video layers may now be rotated.
- Video layers may now be dragged as a whole.
- Video layers are now moved to the front when they are clicked.
- Video layers now are created at the correct aspect ratio of the video.
- Video layers now are created at the correct aspect ratio of the video.
- Masks are now applied to the top video layer when layers are overlapping.
- Layer handles now appear as circles and highlight individually when hovered.

## v0.1.0
(2014-12-03) Initial alpha release
## v0.1.0
(2014-12-03) Initial alpha release
2 changes: 1 addition & 1 deletion Project.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/
//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
ICON_FILE_PATH = bin/data/icons/

OTHER_LDFLAGS = $(OF_CORE_LIBS)
OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
Binary file added bin/data/images/info-slide-osx.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/data/images/info-slide-win-lin.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed bin/data/images/info-slide.png
View file
Open in desktop
Binary file not shown.
Binary file added icon.ico
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions icon.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Icon Resource Definition
#define MAIN_ICON 102

#if defined(_DEBUG)
MAIN_ICON ICON "icon_debug.ico"
#else
MAIN_ICON ICON "icon.ico"
#endif
Binary file added icon_debug.ico
View file
Open in desktop
Binary file not shown.
35 changes: 35 additions & 0 deletions kibio.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kibio", "kibio.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
395 changes: 395 additions & 0 deletions kibio.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

Loading