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.

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

merge lastest version #9

Merged
merged 169 commits into from
Jun 20, 2016
Merged

merge lastest version #9

merged 169 commits into from
Jun 20, 2016

Conversation

caishanli
Copy link
Owner

No description provided.

fix createFont unuse default param FTGLFontType
CHANGE: WorkerPool task execute method now accepts TaskInfo
to get information about underlying async task
instead of being appended to default or -c file.
moved a couple log messages to verbose log.
Note: orun python API might be re-added in a better form in the future.
febret and others added 29 commits April 28, 2016 00:13
Now multiple modules can be added through mtools
…ng into upstream master

Merge remote-tracking branch 'upstream/master'
Add initial support for per-tile nonlinear warping and edge blending
…ed modules

correct behavior: add the new module to the list of already active modules.
NEW: support for local modules
example: omega add master ./localModule
Conflicts:
	CMakeModules/ModuleUtils.cmake
omega remove [dir] [modules]
@caishanli caishanli merged commit 98d14aa into caishanli:master Jun 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants