Well, in the build I provided I checked out the latest revision from wiispeak branch and then merged it with the latest revision from master branch at that time (it was 4.0-202, at that time neither 4.0.1 or 4.0.2 were out) Then, compiled it. The only advantages Just Dance 2014 gets by using a build with the latest master revision merged with wiispeak is being able to play World Dance Floor, other than that it should run identical in wiispeak 3.5-1348...
(01-06-2014, 01:23 PM)Jhonn Wrote: [ -> ]Well, in the build I provided I checked out the latest revision from wiispeak branch and then merged it with the latest revision from master branch at that time (it was 4.0-202, at that time neither 4.0.1 or 4.0.2 were out) Then, compiled it. The only advantages Just Dance 2014 gets by using a build with the latest master revision merged with wiispeak is being able to play World Dance Floor, other than that it should run identical in wiispeak 3.5-1348...
Thanks very much for the description. I have these remaining questions:
1) How did you find the version number for the latest revision (latest back then) of the wiispeak branch? For example, I don't see the version number "3.5-1348" (or any version number) in Git Extensions, I only see commit hash numbers for each revision/object.
- I examined the download link provided for 3.5-1348 and looked in its parent folder, I see there is a new wiispeak build dolphin-wiispeak-4.0-382-x64.7z (Nov 15, 2013) in "https://dl.dolphin-emu.org/builds/". However, I would like to see, as an example and if it exists in some listing, the object wiispeak 3.5-1500 and its commit hash (so that I can find it in Git Extensions)
2) When 2 branches are merged, if the purpose is personal use, does it matter which branch is merged into the other?
3) Did "buildbot" add/commit wiispeak 3.5-1348? I seem to have missed his name when I took a quick look down the wiispeak branch author column.
4) Was there missing material that had to be installed or option that had to be checked when you resolved the compilation errors in VS2012 for the merged object?
Sorry for the long list of questions, I included them all in case any of them could help recover the version numbers in Git Extension. Thanks very much.
(01-06-2014, 03:15 PM)winbox Wrote: [ -> ]1) How did you find the version number for the latest revision (latest back then) of the wiispeak branch? For example, I don't see the version number "3.5-1348" (or any version number) in Git Extensions, I only see commit hash numbers for each revision/object.
If you have a compiled Dolphin build, the About dialog tells you what the hash is.
There is a handy website:
http://changes.dolphin-emu.org/ which has a table of hashes and their corresponding versions. Next page is
https://changes.dolphin-emu.org/page.01.html
You can search for the commit description/date/author in gitk in git extensions.
I also sometimes search google for Dolphin 3.5-1348 wiispeak hash.
(01-06-2014, 03:15 PM)winbox Wrote: [ -> ]2) When 2 branches are merged, if the purpose is personal use, does it matter which branch is merged into the other?
No, it does not really matter. It's probably better to merge the lesser updated branch into the more updated branch so you can easily update the build with new changes. i.e. merge wiispeak into master. That way you can grab updates to master without doing another merge.
(01-06-2014, 03:15 PM)winbox Wrote: [ -> ]3) Did "buildbot" add/commit wiispeak 3.5-1348? I seem to have missed his name when I took a quick look down the wiispeak branch author column.
No, the buildbot adds selected branches.
(01-06-2014, 03:15 PM)winbox Wrote: [ -> ]4) Was there missing material that had to be installed or option that had to be checked when you resolved the compilation errors in VS2012 for the merged object?
No. The latest revisions in the master branch compile on VS2013.
The topmost commit is the latest in the wiispeak branch:
http://code.google.com/p/dolphin-emu/source/list?name=wiispeak
It has a git hash of 808c65c3f5cf470e5c9d925a67db8945b2b1e12f and is Dolphin [wiispeak] 4.0-383.
Thanks very much for the explanations. As practice, I merged wiispeak 4.0-383 (11/17/2013) into master 4.0-599 (1/7/2014).
The result was tested and works for Just Dance 2014. It's uploaded to:
https://www.mediafire.com/?iafargqga2wd15a.
Hello,
Is there any chance someone can compile a version of this for me but for Mac OS X and upload it somewhere? I need it in a dmg format and I cant for the life of me figure out how to compile on my own.
Please and thank you!
-Bryan
(10-09-2013, 05:37 AM)rkn87 Wrote: [ -> ]Hello,
Have you found a solution now for using Just Dance 2014 on Mac OS X ?
I'm using OS X Mountain Lion, any idea how to fix black screen on startup?
Thanks a million,
Intel HD Graphics 4000 512 MB graphics
(07-09-2014, 10:15 AM)einstein4016 Wrote: [ -> ] (10-09-2013, 05:37 AM)rkn87 Wrote: [ -> ]Hello,
Have you found a solution now for using Just Dance 2014 on Mac OS X ?
Have you found a solution now for using Just Dance 2014 on Mac OS X ?
I'm using OS X Mountain Lion, any idea how to fix black screen on startup?
Thanks a million,
Intel HD Graphics 4000 512 MB graphics
Have you found a solution now for using Just Dance 2014 on Mac OS X ?
Compiling in Mac should be pretty straightforward since it already have most of the required components bundled. Did you read
the building instructions?
(07-09-2014, 12:31 PM)Jhonn Wrote: [ -> ]Compiling in Mac should be pretty straightforward since it already have most of the required components bundled. Did you read the building instructions?
Can you please tell me how to merge dolphin Wii speak branch into master? I want to merge wii speak into dolphin 4.0-5561 or can you merge it for me please?