bunnei
069682b5a9
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
8a7d585b9b
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
0cb2e9b718
Merge pull request #1959 from MerryMage/revsh-upstream
...
dyncom: Fix translation of thumb REVSH
2016-07-28 08:43:51 -04:00
MerryMage
786a7da3e4
dyncom: Fix translation of thumb REVSH
2016-07-28 11:51:29 +01:00
bunnei
5ea338b0f2
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
ab5f338c61
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
8187ef9ee9
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
1a7623c6e4
Protection against a resize of size 0
2016-07-23 21:02:05 +02:00
Yuri Kunde Schlesner
6e417cb8d7
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
6d06788176
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
3152b67a44
Merge pull request #1963 from wwylele/rtc
...
Implement actual system time
2016-07-23 04:38:16 -07:00
wwylele
3bc46547ba
CoreTiming: avoid overflow
2016-07-23 14:30:23 +03:00
wwylele
23869b198d
HLE: implement system time
2016-07-23 14:30:23 +03:00
Dale Whinham
2265cf339f
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
7f08bb7a97
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
c4b830144d
Fixes SDL2.dll copy to bindir on windows
2016-07-21 10:28:52 +02:00
JamePeng
4ee66a4959
Correct APT::0x00550040 and APT::0x00560000 function
2016-07-15 19:47:01 +08:00
bunnei
8e1770670e
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
54920b6152
Merge pull request #1894 from wwylele/set-config-block
...
Implement config savegame editing & clean up
2016-07-09 20:39:19 -07:00
wwylele
cffe69d780
Qt: add system settings config tab
2016-07-10 06:22:38 +03:00
bunnei
1a5221abc4
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
5b03774ec3
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
9d7d296457
Fix the errorcode of archive handle
2016-07-05 00:39:09 +08:00
Sebastian Valle
8eea45395b
Merge pull request #1850 from mailwl/erreula
...
HLE/Applets: Implement ErrEula applet
2016-07-04 08:52:42 -07:00
mailwl
46abd6009a
HLE/Applets: Implement ErrEula applet
2016-07-04 09:54:51 +03:00
Subv
f4617ecd24
HLE/FS: Document some command parameters and implemented command 0x08560240 (CreateLegacySystemSaveData)
2016-07-03 13:42:52 -05:00
Sebastian Valle
4fa442e7c7
Merge pull request #1935 from wwylele/fix-result-module
...
Result: Update the ErrorModule enum
2016-07-03 07:24:29 -07:00
wwylele
6d9f9af669
Service::CFG/FS: add and refactor out utilities for front-end
2016-07-03 08:23:59 +03:00
wwylele
8a98e15d04
Service::CFG: move known block ID to an enum
2016-07-03 08:23:59 +03:00
wwylele
633426cc9a
Service::CFG: add SetConfigInfoBlk4
2016-07-03 08:23:58 +03:00
Yuri Kunde Schlesner
de56861da7
Merge pull request #1933 from yuriks/scissor
...
PICA: Implement scissor test
2016-07-02 02:18:46 -07:00
wwylele
5872133200
Service::CFG: add missing language
2016-07-02 11:44:25 +03:00
wwylele
232fdab682
Service::CFG: name sound output modes
2016-07-02 11:44:25 +03:00
wwylele
ebe0de0625
Result: fix and update ErrorModule
2016-06-30 11:26:53 +03:00
Yuri Kunde Schlesner
38d210a375
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
163cafd9cd
Merge pull request #1867 from mailwl/srv-update
...
srv: Update according 3dbrew
2016-06-28 18:53:10 -04:00
Yuri Kunde Schlesner
c8ef6d75bd
OpenGL: Add scaled resolution support to scissor
2016-06-27 22:16:04 -07:00
Yuri Kunde Schlesner
cfe6a16278
PICA: Scissor fixes and cleanups
2016-06-27 21:14:39 -07:00
Subv
8548bcf697
PICA: Implement scissor test
2016-06-27 21:14:13 -07:00
Yuri Kunde Schlesner
7e48b7a39f
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
081b3398ff
Remove superfluous std::move in return std::move(local_var)
2016-06-25 13:26:21 -05:00
bunnei
2f0a811beb
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
37f1c9ee71
Merge pull request #1923 from yuriks/fix-recursive
...
Fix recursive scanning of directories
2016-06-22 16:27:12 -04:00
Jannik Vogel
4ae8c62003
Add GPL license.txt and README.md to builds
2016-06-21 14:19:46 +02:00
bunnei
9f8e49d7ee
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
3c56749bf9
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
1ca36642be
Qt: Fix MicroProfile dpi scaling
2016-06-18 23:37:09 -07:00
bunnei
1c61c74aeb
Merge pull request #1877 from wwylele/wait-fix-timeout
...
Thread: update timeout when reruning WaitSynch
2016-06-18 01:08:22 -04:00
bunnei
ee9d0d5f7b
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
db929f1fd5
CMakeLists: Drop support for Qt 4
2016-06-17 10:48:40 -04:00