Comments (9)
just wonder any plan to intergrate the mediaengine branches to master ? not too sure the merge can help some games go further
from ppsspp.
It needs more work first.
from ppsspp.
Sorry to ask , just wonder how i can merge the mediaengine branch into master myself ? thus i can compile it in VS 2010 express to test the build
from ppsspp.
Try the following:
git checkout -b merged-mediaengine master
git merge mediaengine
And then build.
-[Unknown]
from ppsspp.
Humm ...
E:\documents\GitHub\ppsspp [master +0 ~0 -1]> git checkout -b merged-mediaengine master
D native
Switched to a new branch 'merged-mediaengine'
E:\documents\GitHub\ppsspp [merged-mediaengine +0 ~0 -1]> git merge mediaengine
fatal: mediaengine - not something we can merge
E:\documents\GitHub\ppsspp [merged-mediaengine +0 ~0 -1]>
from ppsspp.
I think i shouldn't try to merge them together as Hrydgard mentioned he need more work first .
from ppsspp.
Sorry, git merge origin/mediaengine. It would only be locally for you, and you could just git checkout master to revert it.
-[Unknown]
from ppsspp.
Thanks .Let me try it out again
from ppsspp.
oioittf is making good progress, his pull request now represents this issue well so I'll close this.
from ppsspp.
Related Issues (20)
- [iOS] Icon styles on iOS are not uniform HOT 10
- [Windows-Vulkan/Direct3D11] Radiant Mythology 2 - Character model rendered incorrectly HOT 5
- iOS audio playback behavior - requests for change HOT 7
- Dante's Inferno crashes whenever I reach this part (regardless of version) HOT 7
- AI game maker HOT 1
- Vulkan: Some weird bugs reported on Windows HOT 2
- 3rd Birthday ghosting HOT 4
- iOS: Recents pointing to games in the app's Documents doesn't work properly HOT 1
- Linux 32-bit and 64-bit Versions HOT 8
- FPS counter doesn't work properly with software render HOT 12
- Android: Switching memstick folder back to "private data" doesn't complete nicely
- multiple tabs in memory layout
- Game Crashing on iOS HOT 4
- Platypus: OpenGL rendering error
- Wild ARM XF - Audio Bug HOT 5
- Should switch the non-app-store iOS build to use statically linked MoltenVK HOT 4
- SOCOM Fireteam Bravo 3: Z-buffer glitch on character customization screen HOT 4
- UPnP Incompatibility with iOS 17.x+ HOT 26
- Please allow .5 and .75 Rendering Resolution HOT 4
- Make the proAdhocServer lighter HOT 4
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from ppsspp.