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

Pull fallguy develop may #1179

Merged
merged 287 commits into from
Sep 22, 2017
Merged

Conversation

halfnelson
Copy link
Contributor

Fallguyconsulting changes up to 3rd June

Patrick Meehan and others added 30 commits September 5, 2015 00:56
…ling when binding resources; moving toward more consistency in binding model
…L desktop host; added loading on display list sample
# Conflicts:
#	src/moai-sim/MOAIDeck.cpp
#	src/moai-sim/MOAIDeck.h
#	util/ant-libmoai/modules/3rdparty-webp.mk
#	util/ant-libmoai/modules/moai-sim.mk
#	xcode/osx/Moai.xcodeproj/project.pbxproj
#	xcode/osx/Moai.xcodeproj/xcshareddata/xcschemes/moai.xcscheme
seems like a bad manual merge from gfx-async - to be reviewed
…Designer to MOAITextLayoutRules (so mDesigner to mLayoutRules, designer to layoutRules)
brought plumzi/moai-dev@develop up to date with fallguyconsulting/moai-dev@develop
Patrick Meehan and others added 28 commits April 27, 2016 12:57
deferencing u32* in PremultiplyAlpha is a BAD_ACCESS
# Conflicts:
#	src/moai-box2d/MOAIBox2DDebugDraw.cpp
#	src/moai-sim/MOAIDraw.cpp
#	src/moai-sim/MOAIGfxDeviceBase.cpp
#	src/moai-sim/MOAIGfxDeviceStateCache.cpp
#	src/moai-sim/MOAIGfxResourceMgr.cpp
#	src/moai-sim/MOAIImage.cpp
#	src/moai-sim/MOAISelectionMesh.cpp
#	src/moai-sim/MOAIVectorUtil.cpp
#	src/moai-util/MOAIStreamAdapter.cpp
#	src/zl-gfx/ZLGfxRetained.cpp
#	src/zl-util/ZLColor.cpp
#	src/zl-util/ZLCopyOnWrite.cpp
#	src/zl-util/ZLLeanStack.h
@halfnelson
Copy link
Contributor Author

I am testing this against with all the prior pull requests in an attempt to catch up. I will post if the tests pan out. (there are a lot of changes)

@patrickmeehan patrickmeehan merged commit 5fea151 into moai:develop Sep 22, 2017
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.

6 participants