Commit graph

4605 commits

Author SHA1 Message Date
Yuri Kunde Schlesner
d8b1a34425 Merge pull request #2004 from MerryMage/stm
Dyncom: Correct implementation of STM for R15
2016-08-14 15:17:32 -07:00
MerryMage
0da5e44c89 Dyncom: Correct implementation of STM for R15 2016-08-14 00:49:34 +01:00
bunnei
c617e27252 Merge pull request #1936 from jroweboy/qt5.7-fix
CMake: Fix for QT 5.7 overwriting -std=c++1y flag
2016-08-08 10:52:05 -04:00
James Rowe
56b2f0da7b 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
Lectem
7df4925923 fix #1942 and adds a few IPC functions for descriptors 2016-08-02 16:45:15 +02:00
Anon
9e4923c36c Input GUI: Add tab to remap controls (#1900) 2016-07-29 08:45:49 -04:00
bunnei
1d27e68bd6 Merge pull request #1950 from JamePeng/fix-apt-0x0055004-and-0x00560000
Correct APT::0x00550040 and APT::0x00560000 function
2016-07-28 20:50:49 -04:00
bunnei
e749770654 Merge pull request #1983 from hrydgard/font-reminder
Shared font file: Instead of segfaulting, log an error to remind the user to dump it
2016-07-28 16:07:10 -04:00
Henrik Rydgard
58e61fa817 Instead of segfaulting, log an error to remind the user to dump the shared font file 2016-07-28 21:47:57 +02:00
bunnei
e249b4a5ef Merge pull request #1959 from MerryMage/revsh-upstream
dyncom: Fix translation of thumb REVSH
2016-07-28 08:43:51 -04:00
MerryMage
a7711eaf4f dyncom: Fix translation of thumb REVSH 2016-07-28 11:51:29 +01:00
bunnei
e43f8c1fdc 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
c02ee1f6ab 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
57d497599c 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
bfc9c4e48f Protection against a resize of size 0 2016-07-23 21:02:05 +02:00
Yuri Kunde Schlesner
8de58f2e34 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
4b1df0ba45 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
2afb21f15c Merge pull request #1963 from wwylele/rtc
Implement actual system time
2016-07-23 04:38:16 -07:00
wwylele
9abf787fed CoreTiming: avoid overflow 2016-07-23 14:30:23 +03:00
wwylele
eaf9f27128 HLE: implement system time 2016-07-23 14:30:23 +03:00
Dale Whinham
f5cd8a3eac 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
dc926035bb 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
0b36e5bf1d Fixes SDL2.dll copy to bindir on windows 2016-07-21 10:28:52 +02:00
JamePeng
24ff9f557a Correct APT::0x00550040 and APT::0x00560000 function 2016-07-15 19:47:01 +08:00
bunnei
0102b0ac82 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
7b50bcee79 Merge pull request #1894 from wwylele/set-config-block
Implement config savegame editing & clean up
2016-07-09 20:39:19 -07:00
wwylele
031589a960 Qt: add system settings config tab 2016-07-10 06:22:38 +03:00
bunnei
5c3394ba22 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
02f3161c48 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
c7d5fee7fb Fix the errorcode of archive handle 2016-07-05 00:39:09 +08:00
Sebastian Valle
27ee4ce752 Merge pull request #1850 from mailwl/erreula
HLE/Applets: Implement ErrEula applet
2016-07-04 08:52:42 -07:00
mailwl
367f5dc215 HLE/Applets: Implement ErrEula applet 2016-07-04 09:54:51 +03:00
Subv
e5bc6593a3 HLE/FS: Document some command parameters and implemented command 0x08560240 (CreateLegacySystemSaveData) 2016-07-03 13:42:52 -05:00
Sebastian Valle
c961b73823 Merge pull request #1935 from wwylele/fix-result-module
Result: Update the ErrorModule enum
2016-07-03 07:24:29 -07:00
wwylele
5489701b38 Service::CFG/FS: add and refactor out utilities for front-end 2016-07-03 08:23:59 +03:00
wwylele
9f0ad67398 Service::CFG: move known block ID to an enum 2016-07-03 08:23:59 +03:00
wwylele
e8231e3594 Service::CFG: add SetConfigInfoBlk4 2016-07-03 08:23:58 +03:00
Yuri Kunde Schlesner
287807b43c Merge pull request #1933 from yuriks/scissor
PICA: Implement scissor test
2016-07-02 02:18:46 -07:00
wwylele
340c64dbbe Service::CFG: add missing language 2016-07-02 11:44:25 +03:00
wwylele
f4156c0f09 Service::CFG: name sound output modes 2016-07-02 11:44:25 +03:00
wwylele
ce3e33ef50 Result: fix and update ErrorModule 2016-06-30 11:26:53 +03:00
Yuri Kunde Schlesner
6bc2f3e2a8 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
2270d7b0f0 Merge pull request #1867 from mailwl/srv-update
srv: Update according 3dbrew
2016-06-28 18:53:10 -04:00
Yuri Kunde Schlesner
8e13889337 OpenGL: Add scaled resolution support to scissor 2016-06-27 22:16:04 -07:00
Yuri Kunde Schlesner
e1b005a568 PICA: Scissor fixes and cleanups 2016-06-27 21:14:39 -07:00
Subv
4a9e0e5430 PICA: Implement scissor test 2016-06-27 21:14:13 -07:00
Yuri Kunde Schlesner
f13b40551b 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
de4705914d Remove superfluous std::move in return std::move(local_var) 2016-06-25 13:26:21 -05:00
bunnei
4c280555ff 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
835b9a4cff Merge pull request #1923 from yuriks/fix-recursive
Fix recursive scanning of directories
2016-06-22 16:27:12 -04:00