Commit Graph
100 Commits
Author SHA1 Message Date
James RoweandGitHub fcf0d104c9 Merge pull request #3161 from lioncash/catch
externals: Update catch to v2.0.1
2017-11-30 12:02:45 -07:00
James RoweandGitHub b7cf793814 Merge pull request #3113 from shinyquagsire23/sdl-cia-install
SDL CIA Installation
2017-11-24 10:23:20 -07:00
James RoweandGitHub de0af83719 Merge pull request #3135 from MerryMage/d-ClearInstructionCache
arm_dynarmic: ClearInstructionCache should clear all instruction caches
2017-11-19 16:39:04 -07:00
James RoweandGitHub c810a3f3b0 Merge pull request #3126 from chris062689/master
Added Webhook notifications for Appveyor.
2017-11-16 20:35:30 -07:00
James Rowe 9d9693c13d Revert "Extracted the attribute setup and draw commands into their own functions"
This reverts commit b3b34a1e76. This
commit causes a performance regression for not enough benefits
2017-11-16 11:46:17 -07:00
James RoweandGitHub 5eabe60aa3 Merge pull request #2969 from mailwl/ptm_step
Service/PTM: Stub GetStepHistory function
2017-11-15 09:39:17 -07:00
James RoweandGitHub 78fc1822c2 Merge pull request #3007 from KAMiKAZOW/patch-1
Install Linux icon in hicolor instead of pixmaps
2017-11-15 09:37:07 -07:00
James RoweandGitHub fae52d3056 Merge pull request #3109 from acnleditor2/fix-ini
sdl2 default ini: fix framelimit
2017-11-13 21:08:20 -07:00
James RoweandGitHub ddee442ff8 Merge pull request #3093 from Subv/missing_includes
Added missing headers to CMakeLists.txt and fixed includes.
2017-11-07 20:09:19 -07:00
James RoweandGitHub bd5fe0c48f Merge pull request #3081 from wwylele/fix-about
citra-qt: fix broken About box
2017-11-06 10:42:04 -07:00
James Rowe 2e6c80d1aa Qt updater integration, based on QtAutoUpdater 2017-11-04 15:00:20 -06:00
James RoweandGitHub c14f802381 Merge pull request #2992 from Subv/ac_srvframework
Services/AC: Converted the ac:i and ac:u services to the new service framework.
2017-11-04 10:42:09 -06:00
James RoweandGitHub edfc8d133a Merge pull request #3044 from Dragios/wnarrowing
Get rid of narrowing conversion warning (-Wnarrowing)
2017-10-27 15:55:14 -06:00
James RoweandGitHub 465e619cbb Merge pull request #3053 from wwylele/debug-build-please
file_sys: Add missing header for PRIU64
2017-10-27 14:47:11 -06:00
James RoweandGitHub 26065fd872 Merge pull request #3047 from Hexagon12/sdl2-sound-fix
Workaround for SDL2 2.0.6 audio issues
2017-10-24 20:40:38 -06:00
James RoweandGitHub b36f748acd Merge pull request #3046 from MerryMage/sdl-disallow-device-changes
sdl2_sink: Disallow audio device from changing any parameter other than the frequency
2017-10-24 09:22:28 -06:00
James RoweandGitHub b4c1c26511 Merge pull request #3028 from MerryMage/fix-3023
citra_qt: Remove use of QKeySequence::Cancel
2017-10-24 09:21:27 -06:00
James RoweandGitHub ceb9880034 Merge pull request #3037 from acnleditor2/dll
Fix Missing libpcre2-16-0.dll from both latest Nightly and Canary builds #3036
2017-10-23 13:25:53 -06:00
James RoweandGitHub 5b22cf08f0 Merge pull request #3024 from MerryMage/hle-lock
hle/lock: Remove #pragma once in cpp file
2017-10-21 08:43:59 -06:00
James RoweandGitHub dcb48840c3 Merge pull request #2993 from shinyquagsire23/am-and-archive-ncch-rework
AM Service and NCCH Archive Rework
2017-10-20 22:59:38 -06:00
James RoweandGitHub f47bf6c8c9 Merge pull request #3001 from Styleoshin/qt_fullscreen
citra-qt : Adding fullscreen mode
2017-10-19 15:30:55 -06:00
James RoweandGitHub e1bb198eae Merge pull request #2966 from jroweboy/qtifw_build_installer
Qtifw build installer
2017-10-11 21:21:51 -06:00
James Rowe 1fc1e2bbd5 Installer: Capitalize T in Team and update install location for linux 2017-10-11 19:24:05 -06:00
James RoweandGitHub d15e15bd05 Merge pull request #2996 from MerryMage/split-travis
travis: Split build scripts for different platforms
2017-10-09 17:27:46 -06:00
James RoweandGitHub 9b19c218a9 Merge pull request #3002 from Dragios/nwm-cmdhdr-fix
Change command header in nwm::UDS Initialize function
2017-10-08 20:23:37 -06:00
James RoweandGitHub 26629c661c Merge pull request #2982 from MerryMage/lazy-macos-opt
macOS: Build x86_64h slice
2017-10-03 11:15:01 -06:00
James RoweandGitHub 8244762b89 Merge pull request #2972 from Subv/ignore_.vs
Add the .vs folder and the CMakeSettings.json file from Visual Studio to gitignore
2017-09-30 10:11:53 -06:00
James Rowe e7da39a382 Installer: Address review comments
Correctly set permissions on mac installer and create a missing folder
2017-09-30 09:12:07 -06:00
James Rowe 709c89a1d8 Installer: Converted the build scripts to cmake and added an "installer" target 2017-09-28 10:46:05 -06:00
James RoweandGitHub 5620327e03 Merge pull request #2954 from Subv/cache_unmapped_mem
Memory/RasterizerCache: Ignore unmapped memory regions when caching physical regions
2017-09-26 16:55:47 -06:00
James RoweandGitHub 93930a966f Merge pull request #2921 from jroweboy/batch-fix-2
GPU: Add draw for immediate and batch modes
2017-09-24 07:57:16 -06:00
James Rowe 19d41dcc6e Remove pipeline.gpu_mode and fix minor issues 2017-09-23 09:28:20 -06:00
James Rowe ad0b57f407 GPU: Add draw for immediate and batch modes
PR #1461 introduced a regression where some games would change configuration
even while in the poorly named "drawing" mode, which broke the heuristic
citra was using to determine when to draw the batch. This change adds
back in a draw call for batching, and also adds in a draw call in
immediate mode each time it adds a triangle.
2017-09-11 09:21:43 -06:00
James Rowe 9e847b7549 Build: Enable SSL in mingw by linking against WinSSL
The mingw builds aren't submitting telemetry because the curl library
they are linked against is configured to use openSSL and openSSL looks
for the certificates in the users home folder. This keeps it from
contacting web services because it can't communicate over SSL.

This commit adds a download in mingw builds that will download a
precompiled curl for mingw linked against winssl and sspi.
2017-09-11 09:10:17 -06:00
James RoweandGitHub 3dcda15195 Merge pull request #2923 from B3n30/system_curl_osx
travis_OSX: build with system curl
2017-09-10 16:07:33 -04:00
James RoweandGitHub 4af793c591 Merge pull request #2918 from jroweboy/remove-debug
Remove excess debug dlls for mingw build
2017-09-06 10:26:38 -04:00
James Rowe ef8925b7ac Remove excess debug dlls for mingw build 2017-09-05 18:57:47 -06:00
James Rowe 79f177c6d2 Fix icon for citra qt 2017-09-03 11:26:10 -06:00
James RoweandGitHub 3fd864d67b Merge pull request #2911 from DaMan69/master
Add manifest
2017-09-03 12:48:02 -04:00
James RoweandGitHub 415d3c0bac Merge pull request #2912 from jroweboy/mingw-master
Build: Add mingw64 compile support to appveyor
2017-09-01 21:37:34 -04:00
James Rowe ab47bf6ad6 Build: Add mingw64 compile support to appveyor
Releases will be built with both mingw and msvc and the binaries of both
builds will be uploaded to github releases
2017-09-01 07:56:36 -06:00
James RoweandGitHub 61442d6afb Merge pull request #2839 from Subv/global_kernel_lock
Kernel/HLE: Use a mutex  to synchronize access to the HLE kernel state between the cpu thread and any other possible threads that might touch the kernel (network thread, etc).
2017-08-23 18:17:44 -06:00
James RoweandGitHub a8675f4287 Merge pull request #2888 from Subv/warnings
Fixed some warnings in the core project.
2017-08-22 08:09:09 -06:00
James RoweandGitHub bbfa9d0635 Merge pull request #2861 from wwylele/motion-refactor
Refactor MotionEmu into a InputDevice
2017-08-19 23:43:01 -06:00
James RoweandGitHub 8afa81ac1b Merge pull request #2871 from wwylele/sw-spotlight
SwRasterizer/Lighting: implement spot light
2017-08-19 20:10:24 -06:00
James RoweandGitHub 8fd28244e4 Merge pull request #2869 from j-selby/docker-build
Travis: Use Docker to build for Linux
2017-08-11 08:39:14 -06:00
James RoweandGitHub a3aa8617bc Merge pull request #2867 from j-selby/tag-naming
Implement correct folder structure for CI builds
2017-08-11 08:36:04 -06:00
James RoweandGitHub 9f6868ad9b Merge pull request #2857 from j-selby/deploy-fix
Travis/AppVeyor: Deploy based upon tags
2017-08-09 19:13:55 -06:00
James RoweandGitHub 343bbfdabc Merge pull request #2860 from anodium/patch-1
Quickfix typo in OpenGL 3.3 error message
2017-08-04 21:14:49 -06:00
James RoweandGitHub 0dc285dcfd Merge pull request #2855 from bunnei/telemetry-additional-fields
Telemetry: Add several more useful fields
2017-08-03 18:37:03 -06:00
James RoweandGitHub fc43e027f6 Merge pull request #2849 from j-selby/master
Produce 7zip artifacts on Travis and Appveyor
2017-07-28 19:34:43 -06:00
James Rowe 0f81e18793 Use WinSSPI instead of OpenSSL
Appveyor has OpenSSL installed, so cURL tries to link against it.
This causes dll not found errors because we would also need to ship
OpenSSL, so we link against Windows SSPI instead.
2017-07-24 09:56:44 -06:00
James RoweandGitHub 68db4f3ece Merge pull request #2830 from linkmauve/master
Make enet use the same convention as other submodules
2017-07-16 16:29:58 -06:00
James Rowe 5990cae193 Update enet submodule
This includes a fix merged upstream to support mingw compilation
2017-07-12 20:39:47 -06:00
James RoweandGitHub 22e7402ab1 Merge pull request #2814 from Kloen/macro-remove
Remove unnecessary WIN32_LEAN_AND_MEAN macro definition
2017-07-01 08:45:42 -06:00
James RoweandGitHub 19f1216e72 Merge pull request #2811 from MerryMage/qtdebug
configure_debug: Add label warning that CPU JIT needs to be disabled …
2017-06-28 12:19:05 -06:00
James RoweandGitHub 7af6931fb5 Merge pull request #2812 from tiagmoraismorgado/patch-1
fixing a couple of typos
2017-06-28 07:32:45 -06:00
James RoweandGitHub 8c22334f96 Merge pull request #2737 from Subv/decryptbeacondata
Services/UDS: Implement DecryptBeaconData.
2017-06-07 10:08:43 -06:00
James RoweandGitHub 8f0a23b631 Merge pull request #2747 from atouchet/readme-url
Fix FAQ Link in Readme
2017-06-03 21:05:08 -06:00
James RoweandGitHub a7ddec88d4 Merge pull request #2746 from Kloen/just-why
Remove unused imports in game_list_p.h
2017-06-03 10:51:57 -06:00
James RoweandGitHub 0f2e32c017 Merge pull request #2718 from citra-emu/appveyor-vs2017
Upgrade AppVeyor to Visual Studio 2017
2017-05-21 17:18:58 -06:00
James Rowe fc2f7b0df6 Frontend: Prevent FileSystemWatcher from blocking UI thread
Instead of tying the QFileSystemWatcher to the GameList and updating in
the UI thread, this change moves it to the worker thread. Since it gets
deleted and recreated as part of the worker thread, this prevents it from
ever getting used from multiple threads (which is why it was originally
done on the UI thread)
2017-05-10 09:37:44 -06:00
James RoweandGitHub 9007c48992 Merge pull request #2658 from JayFoxRox/blend-equation-fix
Pica/Regs: Correct bit width for blend-equations
2017-04-09 13:40:00 -06:00
James Rowe bf325d3859 Change travis tar command to specify compression format
macOS uses bsdtar which doesn't have the -a flag which determines
compression based on file extension.
2017-02-25 14:02:46 -07:00
James RoweandYuri Kunde Schlesner 0be8f8716c Fixes file upload pattern in the travis.yml to include macOS releases (#2592) 2017-02-24 18:12:37 -08:00
James Roweandbunnei 26823cd38b Use QFileSystemWatcher to reload the game list when a change is detected. (#2555)
* Added a refresh game directory option to the file menu

* Make the game list watcher recursive and have it start watching from the initial load

* Rework game list watcher to be thread safe

* Fix code style issues
2017-02-23 16:29:00 -05:00
James RoweandGitHub df8c01604e Revert use gzip for linux
Uses tar -a flag to determine compression algorithm based off file extension (so linux will continue to use xz and macOS can use gzip)
2017-02-23 14:05:47 -07:00
James Rowe c4de706ace Use gzip instead of lzma on macOS and linux releases
A common report from macOS users is they can't figure out how to unzip the
program. This will allow them to double click to unzip the archive which
is what users on macOS expect.
2017-02-23 10:01:50 -07:00
James Rowe b090422991 Gui: Change title bar to include build name
Nightly builds now have "Citra Nightly" in the titlebar
Bleeding edge builds now have "Citra Bleeding Edge" in the titlebar
2017-02-23 00:42:55 -07:00
James RoweandGitHub 372db835f4 Merge pull request #2478 from jfmherokiller/master
fixed the override warning
2017-01-27 15:02:20 -07:00
James RoweandGitHub 0ae7092ba4 Merge pull request #2418 from jroweboy/appveyor_master
Prevents appveyor from attempting to deploy except on the nightly repo
2017-01-08 12:11:12 -07:00
James Rowe 84c6a98374 Prevents appveyor from attempting to deploy except on the nightly repo 2017-01-08 11:17:44 -07:00
James RoweandGitHub 4650486b8e Merge pull request #2407 from jroweboy/nightly-deploy
Change travis to deploy on push to citra-nightly.
2017-01-04 21:42:00 -07:00
James Rowe c4ad608870 Change travis to deploy on push to citra-nightly. Add more information to the releases page 2017-01-04 21:31:40 -07:00
James RoweandGitHub 0920950d5e Merge pull request #2405 from jroweboy/nightly-deploy
Change deploy to use github releases instead
2017-01-04 21:02:51 -07:00
James Rowe 0a6ca01991 Change deploy to use github releases instead, but only for the citra-nightly repo 2017-01-04 20:53:46 -07:00
James RoweandGitHub 3289892cd3 Merge pull request #2401 from jroweboy/travis-key
Try a different travis key
2017-01-03 20:03:57 -07:00
James Rowe 737c8bee16 Try a different travis key 2017-01-03 20:00:26 -07:00
James RoweandGitHub 0b897c45d2 Merge pull request #2390 from jroweboy/bintray
Try a different encrypted bintray api key for travis.
2016-12-31 23:57:36 -05:00
James Rowe 8f6c3b5c20 Try a different encrypted bintray api key for travis. Change appveyor to upload to a long git hash (since travis is stuck uploading to the full hash name) 2016-12-31 23:38:15 -05:00
James RoweandGitHub bb396ed8fc Merge pull request #2254 from jroweboy/bintray
Add deploy to bintray for builds to master
2016-12-31 22:16:44 -05:00
James Rowe 4a6cf7ecaf Trying to make a consistent nightly versioning 2016-12-31 19:37:21 -05:00
James Rowe b03e7bf28f Add deploy to bintray for builds to master 2016-12-31 13:54:51 -05:00
James Roweandbunnei f32309400c Update dynarmic to the latest version (#2234) 2016-11-29 23:22:19 -05:00
James Rowe bbe57a66ca Expose page table to dynarmic for optimized reads and writes to the JIT 2016-11-24 20:41:18 -07:00
James RoweandGitHub c96d143135 Merge pull request #2207 from wwylele/fix-2195
Fix format error from #2195
2016-11-22 12:46:12 -07:00
James RoweandGitHub f68f37b520 Merge pull request #2194 from jroweboy/extremely-minor-clangformat-change
Minor formatting change
2016-11-19 13:51:14 -07:00
James Rowe 19acec351c Minor formatting change 2016-11-19 13:35:07 -07:00
James Rowe c3ea6f4ddb Add mingw compile support 2016-11-13 23:50:46 -07:00
James Rowe 793339b73a Round the rectangle size to prevent float to int casting issues
And other minor style changes
2016-11-12 10:49:47 -07:00
James Rowe 20b622ec89 Remove cmake from the install list. Its now up to date on the new travis mac image 2016-11-11 14:45:52 -07:00
James Rowe d9305b0a07 Add default hotkey to swap primary screens.
Also minor style changes
2016-11-05 03:46:43 -06:00
James Rowe 5f72aade77 Rework frame layouts to use a max rectangle instead of hardcoded calculations 2016-11-05 02:55:58 -06:00
James Rowe 2b1654ad9b Support additional screen layouts.
Allows users to choose a single screen layout or a large screen layout.
Adds a configuration option to change the prominent screen.
2016-11-05 02:55:41 -06:00
James Rowe 93bcd00e44 Create a separate archive for debugsymbols on windows
This reduces the main download size and uploads the symbols to a different
directory
2016-09-01 10:47:31 -06:00
James Rowe 8b685c4308 MSVC: Add RelWithDebInfo and removing debugging from Release.
This should reduce build size on windows from roughly 12MB compressed to 7MB
2016-08-31 20:45:38 -06:00
James Rowe a976c2e3ba CMake: Fix for QT 5.7 overwriting -std=c++1y flag
In QT 5.7 they added a new check for CXX features which appends a minimum
required standard to the CXX_FLAGS. Because we were writing the flag
directly previously, cmake assumed it needed to add a c++11 flag to the
build. This tells cmake to use c++14 on every build.
2016-08-04 17:16:16 -06:00
James RoweandJannik Vogel 98923ab6e5 Config: Restore previously selected audio sink option (#1824) 2016-05-20 20:37:34 +02:00
James Rowe 1bc7829ee9 Move input values into an array 2015-07-27 21:41:21 -06:00
James Rowe a406207cd8 Use condition var to properly pause the CPU thread
Adds support for threaded pausing so citra doesn't spin wait on pause
2015-05-18 08:15:57 -06:00