Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8ab036d
revert core changes until problems in master are fixed
Tinob Jul 24, 2016
a4078c0
Merge commit '96e9e7c309d3ef92bd13deae9d602ee1e9c2f7f4' into Stable
Tinob Aug 20, 2016
a526453
merge latest graphic changes
Tinob Oct 17, 2016
00f3b09
add missing file and fix for opengl shader compilation on amd HD 6xxx…
Tinob Oct 17, 2016
5f4c65b
fix hires textures not updating when enabling/disabling the option
Tinob Oct 20, 2016
ca7d359
fix for some errors on systems that does not support clip control.
Tinob Oct 23, 2016
2f49d93
fix perf queries under opengl
Tinob Oct 26, 2016
fd044d4
fix shader compilation error in openl drivers that does not support e…
Tinob Oct 26, 2016
f78c61f
merge latest graphic changes
Tinob Nov 1, 2016
5482ec3
merge latest fixes from Ishiiruka-Master
Tinob Nov 3, 2016
6fd2b22
Merge latest video changes
Tinob Nov 19, 2016
64875c3
Merge latest changes
Tinob Dec 24, 2016
af7cef3
Merge latest master changes discarding dynamic bat changes
Tinob Dec 27, 2016
7b28bfc
Merge latest master changes
Tinob Dec 30, 2016
bf6f4e4
merge master fixes
Tinob Dec 31, 2016
6cc4afd
Merge latest master changes
Tinob Jan 15, 2017
4c6f779
fix for dx12 out of index descriptors error
Tinob Jan 24, 2017
579a9c5
fix graphical glitches while using multithreaded option under dx12
Tinob Jan 25, 2017
c70e01b
merge small fixes from master
Tinob Feb 15, 2017
360ef2a
merge latest graphic fixes
Tinob Feb 23, 2017
9c8d5e5
small fix for specular lighting
Tinob Mar 2, 2017
76e8988
Merge latest changes
Tinob Apr 2, 2017
23c1fe0
FindHIDAPI imported from master
Apr 28, 2017
4a3c17e
Fix for compilation
May 3, 2017
2bda4a1
Added -std=c++11 for xbrz under Linux
May 3, 2017
ee67f8c
Merge pull request #77 from ntapiam/Stable
Tinob May 3, 2017
d462ca3
merge latest master changes
Tinob May 13, 2017
2e97675
merge fixes from master
Tinob May 21, 2017
3a6f3be
fix for shader compilation error and backend naming reported on the f…
Tinob May 26, 2017
9afcd4a
fix for devices that does not support sample binding layout (Intel on…
Tinob Jun 8, 2017
5df340a
fixes for mac osx thanks to Xaec6 for the debugging
Tinob Jun 9, 2017
5221c82
small fix for 3d vision
Tinob Jun 25, 2017
f4d3418
fix for auto aspect ratio
Tinob Jun 25, 2017
0e5990b
linux compilation fix
Tinob Jun 27, 2017
abf5262
merge latest master changes
Tinob Jul 12, 2017
05f5ddd
Re-Add Instant DMA Hack as an option to fix RE 2/3 audio
Tinob Jul 13, 2017
f39c9a3
fix for linux compilation
Tinob Jul 28, 2017
b7ed3d9
fix linux compilation
Tinob Jul 30, 2017
7ebadde
rename Linux executable to avoid collisions with master
Tinob Jul 31, 2017
853521f
lower case DOLPHIN_EXE_BASE for non-Apple platforms
KAMiKAZOW Jul 31, 2017
51a1b62
Merge pull request #90 from KAMiKAZOW/patch-1
Tinob Jul 31, 2017
08b0cd5
adapt starter to new executable name
Tinob Jul 31, 2017
757ad4d
rename more files to avoid master file collisions
Tinob Jul 31, 2017
f9da606
merge pull #92
Tinob Aug 1, 2017
21e5d7d
Set wxUSE_XLOCALE to 0 in wxgtk.h
KAMiKAZOW Dec 14, 2017
bd5304b
Merge pull request #107 from KAMiKAZOW/patch-4
Tinob Dec 14, 2017
a89bc79
merge latest master graphic changes
Tinob Mar 11, 2018
0362f59
Merge branch 'Stable' of https://github.com/Tinob/Ishiiruka into Stable
Tinob Mar 11, 2018
4a8098e
vulkan shader corrections
Tinob Mar 11, 2018
e8b857d
fix an issue with compressed texture size validation
Tinob Mar 14, 2018
4caa339
enable audio dma hack only for resident evil 2 and 3
Tinob Mar 14, 2018
fb5ee5c
fix for problems loading custom normal maps in top of color textures
Tinob Mar 17, 2018
fed4718
fix a small issue with vertex rounding
Tinob Mar 18, 2018
98ef781
Merge latest graphic changes
Tinob Mar 29, 2018
2d11f5f
small fix for TessellationShaderGen.cpp
Tinob Apr 15, 2018
ad2dbce
fix for linux compilation
Tinob May 21, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ CMakeLists.txt.user
# Ignore emacs temp files
\#*\#
.\#*
# Ignore transifex configuration directory
.tx
# Ignore kdevelop files/dirs
*.kdev4
# Ignore IDEA/Clion files/dirs
Expand Down
28 changes: 5 additions & 23 deletions AndroidSetup.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,10 @@ If you'd like to contribute to the Android project, but do not currently have a

## Prerequisites

* A Linux VM or host, or a Mac.
* JDK 7 for your platform.
* CMake
* [Android NDK](https://developer.android.com/tools/sdk/ndk/index.html)
* [Android Studio](http://developer.android.com/tools/studio/index.html) **OR**
* [Android SDK Tools](http://developer.android.com/sdk/index.html#Other) (for command-line usage)
* [Android Studio](http://developer.android.com/tools/studio/index.html)

If you downloaded Android Studio, extract it and then see [Setting up Android Studio](#setting-up-android-studio).

If you instead chose to download the commoand-line SDK tools, see [Setting up the SDK Tools](#setting-up-the-sdk-tools).

## Setting up Android Studio

1. Launch Android Studio, which will start a first-launch wizard.
Expand All @@ -26,12 +19,6 @@ If you instead chose to download the commoand-line SDK tools, see [Setting up th
7. Use the SDK Manager to get necessary dependencies, as described in [Getting Dependencies](#getting-dependencies).
8. When done, follow the steps in [Readme.md](Readme.md#installation-on-android) to compile and deploy the application.

## Setting up the SDK Tools

1. In `Source/Android`, create a file called `local.properties`.
2. Add a single line: `sdk.dir=<sdk-path>`, where `<sdk-path>` is the path where you extracted the SDK Tools package.
3. Follow the steps in [Readme.md](Readme.md#installation-on-android) to compile and deploy the application.

## Executing Gradle Tasks

In Android Studio, you can find a list of possible Gradle tasks in a tray at the top right of the screen:
Expand All @@ -50,19 +37,14 @@ For command-line users, any task may be executed with `Source/Android/gradlew <t

Most dependencies for the Android project are supplied by Gradle automatically. However, Android platform libraries (and a few Google-supplied supplementary libraries) must be downloaded through the Android package manager.

1. Launch the Android SDK Manager from the commandline by executing `<sdk-path>/tools/android`, or by clicking on its icon in Android Studio's main toolbar:
1. Launch the Android SDK Manager by clicking on its icon in Android Studio's main toolbar:
![Android Studio Package Icon][package-icon]
2. At the bottom of the window, click "Deselect All", and then "Updates".
3. Install or update the following packages:

* SDK Platform, under "Android 5.0.1 (API 21)". This will allow compiling apps that target Lollipop.
* Android Support Repository
* Android Support Library
* Google Repository
2. Install or update the SDK Platform. Choose the API level selected as [compileSdkVersion](Source/Android/app/build.gradle#L5).
3. Install or update the SDK Tools. CMake, LLDB and NDK. If you don't use android-studio, please check out https://github.com/Commit451/android-cmake-installer.

In the future, if the project targets a newer version of Android, or use newer versions of the tools/build-tools packages, it will be necessary to use this tool to download updates.

[components]: http://i.imgur.com/Oo1Fs93.png
[package-icon]: http://i.imgur.com/NUpkAH8.png
[gradle]: http://i.imgur.com/dXIH6o3.png
[shortcut]: http://i.imgur.com/eCWP4Yy.png
[shortcut]: http://i.imgur.com/eCWP4Yy.png
Loading