Commit graph

5646 commits

Author SHA1 Message Date
bunnei 5c743ddfa8 Merge pull request #1959 from MerryMage/revsh-upstream
dyncom: Fix translation of thumb REVSH
2016-07-28 08:43:51 -04:00
MerryMage 60c93ca3b5 dyncom: Fix translation of thumb REVSH 2016-07-28 11:51:29 +01:00
bunnei c523ff2a98 Merge pull request #1966 from dwhinham/info_plist_fix
CMake: Fix Info.plist template for citra_qt/OSX
2016-07-26 15:14:48 -04:00
Andy Tran f8f6722133 Travis Build: OS X Startup Crash Fix (#1962)
* Travis: Mac OS X Build Fix

Addresses the issue of the nightly builds crashing on OS X. In short,
the changes needed were to rename the references within the binaries in
order to make the app “self-contained”.

* Travis: Mac OS X Terminal

Launches citra with a terminal (instead of going straight for the QT
application, skipping the debugging terminal).

* Travis: Clean Up Lines

* Travis: Fix of EOL Issue

* Travis: Merge Fixes from Build Branch

* Travis: Forward OS X Arguments

* Travis: Forward OS X Arg x2

The issue is, is that sure “open citra-qt.app —args test” works, but
drag and drop doesn’t!

* Travis: Something needed to be escaped
2016-07-25 21:08:06 -04:00
bunnei 682b4af017 Merge pull request #1974 from LittleWhite-tb/crash_invalid_size
Protection against a resize of size 0
2016-07-25 11:35:40 -04:00
Alexandre LittleWhite Laurent 7331b79021 Protection against a resize of size 0 2016-07-23 21:02:05 +02:00
Yuri Kunde Schlesner 2117be46a8 Merge pull request #1973 from linkmauve/no-sse4.1
Remove the -msse4.1 on ¬MSVC
2016-07-23 10:52:47 -07:00
Emmanuel Gil Peyrot e09e683720 Remove the -msse4.1 on ¬MSVC.
This option makes the generated binary crash with an illegal
instruction when the target CPU doesn’t support the SSE4.1 extension
(see #1968), with no noticeable performance increase compared to a
generic build.
2016-07-23 17:10:32 +01:00
Yuri Kunde Schlesner 2dee47c827 Merge pull request #1963 from wwylele/rtc
Implement actual system time
2016-07-23 04:38:16 -07:00
wwylele d63a76f4ce CoreTiming: avoid overflow 2016-07-23 14:30:23 +03:00
wwylele 00c34e4df7 HLE: implement system time 2016-07-23 14:30:23 +03:00
Dale Whinham 78b97ee364 CMake: Fix Info.plist template for citra_qt/OSX
The Info.plist template incorrectly uses parentheses instead of curly braces,
which means that building the .app bundle using regular 'make' results in the
variable not being replaced, and hence the app bundle won't start because the
executable name is incorrect.

This commit fixes this issue.
2016-07-21 21:33:54 +01:00
bunnei 624cd9cd98 Merge pull request #1964 from Lectem/sdl2_dll_copy_fix
Fixes SDL2.dll copy to bindir on windows
2016-07-21 09:36:28 -04:00
Lectem c7125f37aa Fixes SDL2.dll copy to bindir on windows 2016-07-21 10:28:52 +02:00
JamePeng d5aa474788 Correct APT::0x00550040 and APT::0x00560000 function 2016-07-15 19:47:01 +08:00
bunnei f95d119dde Merge pull request #1890 from LFsWang/fix-encode-problem
Fix boot_filename encode on Windows
2016-07-14 22:25:52 -04:00
Yuri Kunde Schlesner ffda82eea5 Merge pull request #1894 from wwylele/set-config-block
Implement config savegame editing & clean up
2016-07-09 20:39:19 -07:00
wwylele ec3e99eec7 Qt: add system settings config tab 2016-07-10 06:22:38 +03:00
bunnei 6fa7b1f486 Merge pull request #1940 from JamePeng/fix-archive-error-code
Fix the errorcode of archive handle
2016-07-06 18:37:43 -04:00
Sebastian Valle ff2d1a2b74 Merge pull request #1921 from Subv/fs_funcs
HLE/FS: Document some command parameters and implemented command 0x08560240
2016-07-05 14:45:40 -07:00
JamePeng f87bb8ba0a Fix the errorcode of archive handle 2016-07-05 00:39:09 +08:00
Sebastian Valle 51f4a9fd32 Merge pull request #1850 from mailwl/erreula
HLE/Applets: Implement ErrEula applet
2016-07-04 08:52:42 -07:00
mailwl e06f2705f0 HLE/Applets: Implement ErrEula applet 2016-07-04 09:54:51 +03:00
Subv 8752f07e8e HLE/FS: Document some command parameters and implemented command 0x08560240 (CreateLegacySystemSaveData) 2016-07-03 13:42:52 -05:00
Sebastian Valle b48b8ed5e5 Merge pull request #1935 from wwylele/fix-result-module
Result: Update the ErrorModule enum
2016-07-03 07:24:29 -07:00
wwylele ab2eef396a Service::CFG/FS: add and refactor out utilities for front-end 2016-07-03 08:23:59 +03:00
wwylele 457b6413e6 Service::CFG: move known block ID to an enum 2016-07-03 08:23:59 +03:00
wwylele 324c8d21a4 Service::CFG: add SetConfigInfoBlk4 2016-07-03 08:23:58 +03:00
Yuri Kunde Schlesner 45c91bf87b Merge pull request #1933 from yuriks/scissor
PICA: Implement scissor test
2016-07-02 02:18:46 -07:00
wwylele f00e8d4b2b Service::CFG: add missing language 2016-07-02 11:44:25 +03:00
wwylele 3687a805ec Service::CFG: name sound output modes 2016-07-02 11:44:25 +03:00
wwylele e023a4cfd0 Result: fix and update ErrorModule 2016-06-30 11:26:53 +03:00
Yuri Kunde Schlesner de79b6fc48 Merge pull request #1869 from wwylele/dont-be-lazy
Switch context to the same thread if necessary
2016-06-28 21:03:52 -07:00
bunnei 87c07643ff Merge pull request #1867 from mailwl/srv-update
srv: Update according 3dbrew
2016-06-28 18:53:10 -04:00
Yuri Kunde Schlesner ecf6ecf325 OpenGL: Add scaled resolution support to scissor 2016-06-27 22:16:04 -07:00
Yuri Kunde Schlesner f0b9bc14b6 PICA: Scissor fixes and cleanups 2016-06-27 21:14:39 -07:00
Subv f9be06b15f PICA: Implement scissor test 2016-06-27 21:14:13 -07:00
Yuri Kunde Schlesner 9cde5cbbd3 Merge pull request #1930 from scurest/superfluous-moves
Remove superfluous std::move in return std::move(local_var)
2016-06-25 12:56:26 -07:00
scurest 0f9274fe24 Remove superfluous std::move in return std::move(local_var) 2016-06-25 13:26:21 -05:00
bunnei 0433e6cf0b Merge pull request #1926 from JayFoxRox/gpl
Add GPL license.txt and README.md to builds
2016-06-23 22:11:11 -04:00
bunnei 4d31874c7c Merge pull request #1923 from yuriks/fix-recursive
Fix recursive scanning of directories
2016-06-22 16:27:12 -04:00
Jannik Vogel ede028fe4d Add GPL license.txt and README.md to builds 2016-06-21 14:19:46 +02:00
bunnei b836ae5c6a Merge pull request #1922 from yuriks/microprofile-dpi-fix
Qt: Fix MicroProfile dpi scaling
2016-06-20 21:13:15 -04:00
Yuri Kunde Schlesner d6792632f0 Fix recursive scanning of directories
ForeachDirectoryEntry didn't actually do anything with the `recursive`
parameter, and the corresponding callback parameter was shadowing the
actual recursion counters in the user functions.
2016-06-19 00:12:15 -07:00
Yuri Kunde Schlesner c52754e79a Qt: Fix MicroProfile dpi scaling 2016-06-18 23:37:09 -07:00
bunnei 8f86cc4df9 Merge pull request #1877 from wwylele/wait-fix-timeout
Thread: update timeout when reruning WaitSynch
2016-06-18 01:08:22 -04:00
bunnei 0473b59256 Merge pull request #1917 from lioncash/ci
CI: Use Qt 5 and GCC 6 on Ubuntu CI builds
2016-06-17 14:09:54 -04:00
Lioncash d5f5aeeab8 CMakeLists: Drop support for Qt 4 2016-06-17 10:48:40 -04:00
Lioncash a81b9ca689 travis: Use GCC 6 on Ubuntu CI builds 2016-06-17 10:48:40 -04:00
Lioncash c283a8509d travis: Use Qt 5 on Ubuntu CI builds 2016-06-17 10:48:35 -04:00