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

ofxOscReceiver: win32 implementation: shadow posix changes #7979

Merged
merged 2 commits into from
May 22, 2024

Conversation

artificiel
Copy link
Contributor

the INSTANTLY OUT OF SCOPE test might need this

@artificiel artificiel changed the title ofxOscReceiver: win32 implementation: shader posix changes ofxOscReceiver: win32 implementation: shadow posix changes May 21, 2024
@ofTheo ofTheo merged commit 45873d9 into openframeworks:master May 22, 2024
11 checks passed
@artificiel artificiel deleted the ofxOscReceiver-win32 branch May 22, 2024 03:13
danoli3 added a commit to danoli3/openFrameworks that referenced this pull request Jun 18, 2024
* master: (244 commits)
  ofxAssimpModelLoader addon_config.mk osx exclusions
  Downloader 3.2.3 - fixes for install detection and single url for curl (openframeworks#8009)
  Downloader 3.2.3 - fixes for install detection and single url for curl
  Download libs script update (adds openframeworks#7907 wget2) - params and fixes deploy logs  (openframeworks#8002)
  .mk removing repeated configs
  COREVIDEO_SILENCE_GL_DEPRECATION (openframeworks#8005)
  ios template update
  update addons folder in xcode template (openframeworks#8003)
  VS download latest x64 only (openframeworks#7999)
  Android 2024 template (openframeworks#7991)
  XCode macOS template update
  up (openframeworks#7996)
  msys2 improvements (openframeworks#7976)
  commented out .h files removed (openframeworks#7990)
  VS2022 FreeType Fix (openframeworks#7992)
  Update ofPixels.cpp (openframeworks#7989)
  ofAppNoWindow..h: #include ofEvents to complete the ofCoreEvents type (openframeworks#7943)
  ofFile::doesFileExist simplified (openframeworks#7970)
  fix unneeded reference for `add` of `bool`, `char` (openframeworks#7973)
  ofxOscReceiver: win32 implementation: shadow posix changes (openframeworks#7979)
  ...

# Conflicts:
#	.gitignore
#	libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp
#	libs/openFrameworks/gl/ofShader.cpp
#	libs/openFrameworks/gl/ofTexture.h
#	libs/openFrameworks/graphics/ofGraphicsBaseTypes.cpp
#	libs/openFrameworks/graphics/ofTrueTypeFont.cpp
#	libs/openFrameworks/graphics/ofTrueTypeFont.h
#	libs/openFrameworks/sound/ofAVEngineSoundPlayer.h
#	libs/openFrameworks/sound/ofSoundBaseTypes.h
#	libs/openFrameworks/utils/ofConstants.h
#	libs/openFrameworks/utils/ofThread.h
#	libs/openFrameworks/utils/ofURLFileLoader.cpp
#	libs/openFrameworks/utils/ofUtils.h
#	libs/openFrameworks/utils/ofXml.h
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.

None yet

2 participants