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

Rename assimpExample remove 3DModelLoaderExample #7510

Merged
merged 3 commits into from
Apr 20, 2023

Conversation

ofTheo
Copy link
Member

@ofTheo ofTheo commented Apr 20, 2023

No description provided.

@ofTheo ofTheo merged commit 7367cf8 into openframeworks:master Apr 20, 2023
@ofTheo ofTheo deleted the rename-example branch April 20, 2023 15:50
danoli3 added a commit to danoli3/openFrameworks that referenced this pull request Apr 30, 2023
…studo_all_architectures_ndk24

* commit '515b768b1d9cc133d651d045c64a14c09dd254ba': (298 commits)
  switch package gen to use PG from github (openframeworks#7540)
  fix macOS issue where fullscreen activation is broken after maximizing with green button (openframeworks#7538)
  make MF foundation default for visual studio (openframeworks#7534)
  move serialTest (openframeworks#7536)
  map (openframeworks#7535)
  Fixing GLFW issue in Ubuntu 16.04 - GLFW_TRANSPARENT_FRAMEBUFFER (openframeworks#7532)
  update linux64 (openframeworks#7531)
  add linuxaarch64 to ofxKinect to support kinect on raspberrypi 64 bit (openframeworks#7530)
  add missing gstreamer packages for Ubuntu 22.04 and newer closes openframeworks#7516 (openframeworks#7528)
  RPI - Linux aarch64 minor fixes (openframeworks#7527)
  bump version (openframeworks#7526)
  Windows Media Foundation and XAudio Sound Player (openframeworks#7523)
  Bugfix vs pg (openframeworks#7525)
  use AV_Engine if OF_NO_FMOD is defined (openframeworks#7512)
  manual run nightly
  Proposal: a way of not bundling FMOD in XCode (openframeworks#7507)
  add linuxaarch64 to nightly builds and create_package (openframeworks#7511)
  Rename assimpExample remove 3DModelLoaderExample (openframeworks#7510)
  faster sort and option for natural, fast and by date (openframeworks#7509)
  Media Foundation Video Player fix pixels (openframeworks#7506)
  ...

# Conflicts:
#	addons/ofxAndroid/src/ofAppAndroidWindow.cpp
#	libs/openFrameworks/3d/ofMesh.h
#	libs/openFrameworks/3d/ofMesh.inl
#	libs/openFrameworks/app/ofAppBaseWindow.h
#	libs/openFrameworks/gl/ofMaterial.cpp
#	libs/openFrameworks/gl/ofTexture.h
#	libs/openFrameworks/graphics/ofTrueTypeFont.cpp
#	libs/openFrameworks/graphics/ofTrueTypeFont.h
#	libs/openFrameworks/sound/ofAVEngineSoundPlayer.h
#	libs/openFrameworks/sound/ofAVEngineSoundPlayer.mm
#	libs/openFrameworks/sound/ofSoundBaseTypes.cpp
#	libs/openFrameworks/sound/ofSoundBaseTypes.h
#	libs/openFrameworks/sound/ofSoundStream.cpp
#	libs/openFrameworks/utils/ofConstants.h
#	libs/openFrameworks/utils/ofFileUtils.cpp
#	libs/openFrameworksCompiled/project/android/build.gradle
#	libs/openFrameworksCompiled/project/android/config.android.default.mk
#	libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj
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.

1 participant