OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-30 05:00:05 +00:00
Code Issues Projects Releases Wiki Activity
7,598 Commits 1 Branch 0 Tags 135 MiB
0556cac37d
Commit Graph

769 Commits

Author SHA1 Message Date
Emmanuel Gil Peyrot
f5d38649c7 Remove trailing spaces in every file but the ones imported from SkyEye, AOSP or generated 2014-11-19 09:03:07 +00:00
bunnei
40acd63631 Merge pull request #165 from neobrain/viewport-scaling 
Stretch emulation output to render window and be display density independent
 2014-11-18 18:32:01 -05:00
Lioncash
1a8f466217 Remove extraneous semicolons 2014-11-18 08:27:16 -05:00
Tony Wasserka
5785f764ab EmuWindow: Add some explicit documentation and set proper minimal client area size. 2014-11-18 13:16:02 +01:00
Tony Wasserka
6a6464807a EmuWindow: Add a TODO. 
Implementing this function currently is not critical, as we don't perform any configuration changes, yet.

However, the interface is a good starting point for adding this functionality.
 2014-11-18 13:16:02 +01:00
Tony Wasserka
e02ff0121f MathUtil: Make Rectangle work with unsigned types. 2014-11-18 13:15:59 +01:00
Tony Wasserka
19bb01c223 EmuWindow: Better document the purpose of OnMinimalClientAreaChangeRequest. 2014-11-18 13:09:01 +01:00
Tony Wasserka
182476c96a EmuWindow: Remove window title getters/setters. 
The window title is none of the emulation core's business. The GUI code is free to put whatever it wants there.
Providing properly thread-safe window title getters and setters is a mess anyway.
 2014-11-18 13:09:01 +01:00
Tony Wasserka
ded9c8a826 EmuWindow: Add documentation. 2014-11-18 13:09:01 +01:00
Tony Wasserka
722ce22589 EmuWindow: Add support for specifying minimal client area sizes. 2014-11-18 13:09:01 +01:00
Tony Wasserka
bd8f491e4c Fixup EmuWindow interface and implementations thereof. 2014-11-18 13:09:01 +01:00
Kevin Hartman
221a9b023d Viewport scaling and display density independence 
The view is scaled to be as large as possible, without changing the aspect, within the bounds of the window.
On "retina" displays, or other displays where window units != pixels, the view should no longer draw incorrectly.
 2014-11-18 13:06:05 +01:00
Tony Wasserka
c8d933a142 Add a GUI logging channel. 
Replace asserts with _dbg_assert_.
 2014-11-18 13:03:02 +01:00
Lioncash
827e7a1898 emu_window: Fix initializer list order. 
Gets rid of a warning on OSX.
 2014-11-17 09:27:59 -05:00
archshift
1f7c4ab7f6 Use std::u16string for conversion between UTF-8 and UTF-16, FS:USER functions 2014-11-12 19:30:17 -08:00
Gareth Poole
38df9e96dd Renamed souce files of services to match port names 2014-10-29 15:55:51 -04:00
Yuri Kunde Schlesner
d72708c1f5 Add override keyword through the code. 
This was automated using `clang-modernize`.
 2014-10-26 16:18:05 -02:00
Yuri Kunde Schlesner
da564d3fe0 Fix compile errors in Clang 2014-10-26 16:18:04 -02:00
Tony Wasserka
a7a57c04c6 Merge pull request #150 from lioncash/typo 
bit_field: Fix a typo in the sample usage.
 2014-10-25 21:19:43 +02:00
Lioncash
2dce9b2ead bit_field: Fix a typo in the sample usage. 2014-10-25 15:18:34 -04:00
archshift
7fa4dbd0c6 Removed uses of raw c-string manipulation functions. 2014-10-23 21:44:10 -07:00
bunnei
ce8390ac03 Merge pull request #133 from archshift/sdmc-enabled 
Use config files to store whether SDMC is enabled or not, auto-create SDMC dir.
 2014-10-23 18:51:54 -04:00
Yuri Kunde Schlesner
b75ac24391 Use std sized types instead of platform specific typedefs 2014-10-22 22:43:15 -02:00
archshift
a7c7946867 Common: Return from CreateFullPath early if the directory creation fails 2014-10-22 15:24:25 -07:00
bunnei
a171000cbe Merge pull request #108 from archshift/config 
Configuration files
 2014-10-07 19:44:13 -04:00
archshift
e6594f9f53 Added configuration file system. 
Uses QSettings on citra-qt, and inih on citra-cli.
 2014-10-07 15:09:37 -07:00
Emmanuel Gil Peyrot
fbd72fd6bf Common: Add a helper function to generate a 8.3 filename from a long one. 
Core: Fix the SDMC Directory implementation to make blargSnes work.
 2014-10-06 19:58:43 +02:00
Lioncash
ca2f0de08a Fix warnings in core and common 2014-09-28 11:44:14 -04:00
bunnei
ee7cfc71bd Merge pull request #118 from lioncash/chunk-file 
chunk_file: General cleanup
 2014-09-22 22:02:51 -04:00
Lioncash
ff442d6cf9 chunk_file: General cleanup 
- Remove unnecessary ifdefs
- Remove commented out code. Can be retrieved later if needed.
 2014-09-21 18:36:14 -04:00
archshift
1966f7b0ad Use the citra user path for the sdmc directory 2014-09-21 09:34:33 -07:00
Emmanuel Gil Peyrot
6b7b36a874 Common: Rename the File namespace to FileUtil, to match the filename and prevent collisions. 2014-09-17 14:35:45 +00:00
Emmanuel Gil Peyrot
edaf59a759 Common: Return the number of items read/written in IOFile’s methods instead of a boolean. 2014-09-17 14:35:45 +00:00
Kevin Hartman
02fd19b2f6 Added support for multiple input device types for KeyMap and connected Qt. 2014-09-12 01:15:14 -07:00
Kevin Hartman
4a94ec934a Initial HID PAD work, with GLFW only. 2014-09-11 22:43:42 -07:00
bunnei
532a9e80a0 Merge pull request #99 from archshift/ext-check 
loader.cpp: improved file extension checking, made Upper/LowerStr useful, moved string_util into Common namespace
 2014-09-11 00:04:36 -04:00
bunnei
d79fe3ebaa Merge pull request #103 from archshift/prune 
Prune redundant includes
 2014-09-10 18:44:08 -04:00
bunnei
249a567834 Merge pull request #104 from archshift/removal 
Removed fixed_size_queue.h
 2014-09-09 20:56:28 -04:00
bunnei
8891c27425 Merge pull request #101 from lioncash/inf-loop 
Common: Fix a potential infinite loop in StringUtil's ReplaceAll
 2014-09-09 20:53:33 -04:00
archshift
727bad24a2 Removed fixed_size_queue.h 
It's unused and doesn't look like it compiles anyway :/
 2014-09-08 18:49:41 -07:00
archshift
9d7cc2bedc common: Prune all redundant includes 2014-09-08 17:25:43 -07:00
archshift
8fe5f2e2fe Moved common_types::Rect from common to Common namespace 2014-09-08 15:43:36 -07:00
archshift
5472fd4d9b Added string_util to common, small changes in loader.cpp 2014-09-08 15:43:22 -07:00
archshift
4ed24a0619 loader.cpp: improved file extension checking, made Upper/LowerStr useful 
Instead of forcibly taking the last 4 characters, it now finds the last extension separator (the period) and takes a substr of its location.
 2014-09-08 15:41:58 -07:00
Lioncash
5b65decf91 Common: Remove HAVE_CXX11_SYNTAX define from Common.h 2014-09-08 15:01:15 -04:00
Lioncash
2f6ef914db Common: Fix a potential infinite loop in StringUtil's ReplaceAll 2014-09-08 14:48:59 -04:00
archshift
498d1a37f1 Removed common/std_xyz, instead using the std header 2014-09-07 14:31:07 -07:00
archshift
4795a64fc8 Removed common/atomic, instead using std::atomic 2014-09-02 22:40:02 -07:00
Yuri Kunde Schlesner
c57de3e404 Remove hand-crafted Visual Studio solution. 2014-09-01 18:06:30 -03:00
Yuri Kunde Schlesner
b15d631d99 Avoid LOGGING redefinition warnings. 2014-09-01 18:06:30 -03:00
Yuri Kunde Schlesner
45976da975 CMake cleanup 
Several cleanups to the buildsystem:
 - Do better factoring of common libs between platforms.
 - Add support to building on Windows.
 - Remove Qt4 support.
 - Re-sort file lists and add missing headers.
 2014-09-01 18:06:30 -03:00
bunnei
59d512484a Merge pull request #58 from lioncash/clamp 
Common: Add a clamp function to math_utils.h
 2014-08-21 11:31:43 -04:00
Lioncash
2f571a0d9d Common: Add a clamp function to math_utils.h 2014-08-19 03:37:38 -04:00
Lioncash
85a20a9b19 Common: Get rid of an unnecessary forward declaration in symbols.h 2014-08-18 16:40:17 -04:00
Lioncash
a49a5fa4d9 Common: Don't return a reference to a string when calling GetName in symbols.cpp 
Returning a copy of the string is what was likely meant to be done.
 2014-08-18 01:59:03 -04:00
bunnei
68c81f28d9 Merge pull request #52 from lioncash/memory 
Common: Correctly set ptr to null if mmap fails in memory_util
 2014-08-17 20:38:28 -04:00
bunnei
54d5d4477f Merge pull request #48 from linkmauve/master 
Replace insecure temporary file creation with devshm.
 2014-08-17 20:33:47 -04:00
Lioncash
cc9f352b66 Common: Correctly set ptr to null if mmap fails in memory_util 
On POSIX systems mmap will return MAP_FAILED ((void*)-1) instead of a null pointer.
 2014-08-17 14:08:43 -04:00
Lioncash
da6f24b374 Common: Move remaining C header includes over to their C++ equivalent 2014-08-17 13:54:06 -04:00
Lioncash
90e994471a Common: Move header guards over to pragma once 
Also replaced C headers with the C++ equivalent ones
 2014-08-17 13:45:55 -04:00
Emmanuel Gil Peyrot
c91d9fd837 mem_arena: Replace insecure temporary file creation with devshm, importing Dolphin’s code. 2014-08-16 10:12:30 +02:00
archshift
a7c549a40c Simplified if-tree in extended_trace.cpp 2014-08-12 14:34:25 -07:00
bunnei
0ccd026a6d Merge pull request #41 from archshift/itr 
Changed iterators to use auto, many of which using range-based loops
 2014-08-12 10:12:39 -04:00
archshift
1a2604902f break_points.cpp: return directly from conditionals 2014-08-12 04:04:54 -07:00
archshift
e3efc613fd break_points: cleaned up, added find_ifs 2014-08-12 03:48:11 -07:00
archshift
5a7c3ad194 Changed iterators to use auto, some of which using range-based loops 2014-08-11 17:53:23 -07:00
Tony Wasserka
9c781a6c76 Remove the fancy RegisterSet class introduced in 4c2bff61e. 
While it was some nice and fancy template usage, it ultimately had many practical issues regarding length of involved expressions under regular usage as well as common code completion tools not being able to handle the structures.
Instead, we now use a more conventional approach which is a lot more clean to use.
 2014-08-12 02:17:21 +02:00
Anthony J. Bentley
dad3655a6d Use pthread_set_name_np() on OpenBSD. 2014-08-07 22:56:58 -06:00
Tony Wasserka
246cb75584 RegisterSet: Simplify code by using structs for register definition instead of unions. 2014-07-23 00:33:08 +02:00
Yuri Kunde Schlesner
78eb8ba844 [build] Search for the git binary in the default msysgit install dir 
The Git for Windows installer doesn't add the Git binaries to the path
by default. (Due to risk of conflicts with built-in windows commands.)
Unless you have configured your system specially this causes the
scm_rev_gen.js script to fail to find Git.  Added more paths to the
script so that it searches in the default msysgit installation
directory, eliminating the need to set the PATH for most environments.
 2014-07-19 17:16:05 -03:00
Tony Wasserka
0da8e2eacc BitField: Cast enum values to proper integer type. 2014-07-16 12:47:33 +02:00
Tony Wasserka
cd1d5786d9 BitField: Add a static_assert. 
Being able to store BitField within unions requires BitField to be of standard layout, which in turn is only given if the underlying type is also has standard layout.
 2014-07-16 12:46:37 +02:00
Tony Wasserka
15ab5382a5 BitField: Delete copy assignment to prevent obscure bugs. 
Cf. https://github.com/dolphin-emu/dolphin/pull/483
 2014-07-16 09:08:19 +02:00
Tony Wasserka
47a001722d BitField: Add an explicit evaluation method. 
Sometimes it can be beneficial to use this in places where an explicit cast needs to happen otherwise. By using the evaluation method, it's not necessary anymore to explicitly write the underlying type in this case.
 2014-07-16 09:05:29 +02:00
bunnei
004df76795 Merge branch 'threading' of https://github.com/bunnei/citra 
Conflicts:
	src/core/hle/function_wrappers.h
	src/core/hle/service/gsp.cpp
 2014-06-14 12:13:16 -04:00
bunnei
b919158050 Removed definition of MAX_PATH, this is already defined in common_paths.h. 2014-06-12 06:10:55 -04:00
archshift
ee4717aaae Preprocessor: #if's out OSX-specific GL changes on other platforms 2014-06-12 06:10:55 -04:00
bunnei
06ef8f001a Common: Removed duplicate "LONG" and "MAX_PATH" definitions. 2014-06-12 06:10:54 -04:00
Tony Wasserka
4c2bff61e5 Pica: Use some template magic to define register structures efficiently. 2014-06-12 06:10:54 -04:00
Tony Wasserka
1dfa392824 Rename LCD to GPU. 2014-06-12 06:10:49 -04:00
bunnei
00adbc7817 log: updated MAX_LOGLEVEL to use correct log level enum type 2014-06-01 11:49:58 -04:00
bunnei
5cd922d151 log: updated GenericLog __attribute__ for newly added parameter 2014-06-01 11:05:48 -04:00
bunnei
6fc62f8c93 log: fixed to not print twice, enabled coloring, added OS print logging as its own type 2014-05-29 23:03:03 -04:00
bunnei
32c314c992 Merge branch 'threading' 2014-05-22 22:57:45 -04:00
archshift
5a8ed196e6 common_types: Changed BasicRect back to Rect, in the common namespace 
Only Rect is in the namespace for now; the rest of common should be added in the future
 2014-05-19 17:57:35 -07:00
archshift
034e3aabc8 Improved clarity and whitespace 
Changed QGL version to 3,2 in order to be less restrictive, yet it should still change up to 4,1 on OSX on Qt5.
 2014-05-19 15:21:55 -07:00
archshift
403e4bf837 CMakeLists: rename HEADS, improved comments 
Changes for clarity of comments, removed redundant compiler flags.
 2014-05-19 15:19:36 -07:00
archshift
c1394650ff Updated cmakelists 2014-05-16 23:39:27 -07:00
archshift
b8c8d0903e Merge remote-tracking branch 'upstream/master' into issue-7-fix 2014-05-16 23:21:03 -07:00
bunnei
43bc2ac724 added MIN, MAX, and CLAMP macros to common_funcs 2014-05-17 00:53:41 -04:00
bunnei
cf2eb8e3d3 added ThreadQueueList class to common (taken from PPSSPP) 2014-05-15 18:19:34 -04:00
bunnei
daf7a7880a added kernel logger to common 2014-05-09 20:54:51 -04:00
bunnei
a6b047ec3b removed incorrect dolphin copyright line 2014-05-08 17:11:41 -04:00
bunnei
a713bd1bad fixed include of common in bit_field.h 2014-05-07 21:44:16 -04:00
bunnei
505d984f16 logger fix for linux 2014-05-07 21:34:04 -04:00
bunnei
92bde183dd added GSP to loggers 2014-05-07 20:59:21 -04:00
bunnei
e7a0283625 added BitField to common 2014-05-07 18:14:42 -04:00
bunnei
9db26df05f - added better SVC logging 
- added stubs for GetResourceLimit and GetResourceLimitCurrentValues SVCs
 2014-05-06 17:18:20 -04:00
archshift
7817d6c79a Support for C++11 on OSX 2014-04-30 23:47:38 -07:00
archshift
704075f04a Fixed indents 2014-04-30 20:13:28 -07:00
archshift
52377cf0d2 Some more experimentation 2014-04-29 19:27:01 -07:00
archshift
5a9c2ce5ea IT'S ALIVE! 2014-04-28 19:40:39 -07:00
archshift
5749d1eabe Fix complaints about functions that could not be found 2014-04-27 22:25:30 -07:00
archshift
5741f2fb26 Problematic class with no current implementation 2014-04-27 22:24:39 -07:00
archshift
ff48c8bed3 Rect to BasicRect 
Somewhere along the line an OSX header had already taken the name Rect.
 2014-04-27 22:21:46 -07:00
bunnei
81cb80997a add missing bswap functions 2014-04-27 21:49:50 -04:00
bunnei
535947a0e1 fix for issue Linux build #9, not sure why this is broken but its unused code I'm just getting rid of it 2014-04-27 21:31:50 -04:00
bunnei
438dba40c1 Merge branch 'hle-interface-updates' 2014-04-27 21:25:16 -04:00
bunnei
a48c6b947d removed DISALLOW_COPY_AND_ASSIGN in favor of NonCopyable class 2014-04-27 18:29:51 -04:00
Thomas Edvalson
08e1ba746f Resolved undefined Common::g_scm_branch error. 2014-04-25 10:34:27 -04:00
bunnei
66a98ea686 made qt window title consistent 2014-04-23 22:49:55 -04:00
bunnei
80a040ac77 fixes to scm_rev generation to make it conistent with windows build 2014-04-23 19:13:00 -07:00
ShizZy
121960a2eb updated windows scm_rev code to use new style 2014-04-23 22:04:33 -04:00
bunnei
4405a53cf3 added scm rev generation on Linux/cmake 2014-04-23 18:43:57 -07:00
bunnei
7a136b8a84 fixes to build on linux 2014-04-22 19:42:29 -07:00
ShizZy
c479921142 removed duplicate rotl/rotr functions 2014-04-22 18:47:43 -04:00
ShizZy
5c89324809 updated CMakeLists for missing files 2014-04-22 18:35:40 -04:00
bunnei
958bca606e Merge branch 'hle-interface' 2014-04-18 17:52:49 -04:00
bunnei
c3a4b4bfca added NDMA hardware interface 2014-04-17 23:43:55 -04:00
bunnei
cb504e236b added helper functions for upper/lowercase strings 2014-04-14 21:25:46 -04:00
Mathieu Vaillancourt
d046cfbba1 Add symbols map 2014-04-12 19:04:31 -04:00
bunnei
d4cb2aab63 added logger for generic HLE 2014-04-10 22:43:48 -04:00
bunnei
17b32b7b3f removed scm_rev.h from version control 2014-04-10 20:05:58 -04:00
bunnei
7b3cde1f3a added missing const to GetWindowTitle 2014-04-10 20:04:38 -04:00
bunnei
6b83509a7e updated CMakeLists 2014-04-09 23:09:05 -04:00
bunnei
5da03e821e - removed deprecated version.h 
- cleaned up window title
- cleaned up emu_window_glfw/emu_window
 2014-04-08 23:18:23 -04:00
bunnei
2c54d5eee2 fixed scm_rev_gen 2014-04-08 20:20:10 -04:00
bunnei
de0a034a84 fixed project includes to use new directory structure 2014-04-08 20:15:08 -04:00
bunnei
63e46abdb8 got rid of 'src' folders in each sub-project 2014-04-08 19:25:03 -04:00
bunnei
aa3ae1af49 added "citra" instead of "emu" to title bar 2014-04-06 22:49:54 -04:00
bunnei
0716470609 added logger option specifically for the renderer 2014-04-06 16:56:42 -04:00
bunnei
89fd6eb237 added missing includes to common_types.h 2014-04-05 15:47:55 -04:00
bunnei
02bcb4cfad Updated common_types.h to use Gekko's version w/ Rect and some useful unions 2014-04-05 15:22:36 -04:00
bunnei
925a894c1b added DISALLOW_COPY_AND_ASSIGN macro 2014-04-05 15:22:11 -04:00
bunnei
7509a9b21f added LCD logger 2014-04-05 01:25:13 -04:00
bunnei
006bb834df added a HW option to logging 2014-04-04 22:53:34 -04:00
bunnei
c9b5b89e21 convert tabs to spaces 2014-04-01 18:48:08 -04:00
bunnei
07ea22de5c grabbed ppsspp's MemArena 2014-03-31 21:04:50 -04:00
ShizZy
2f2a980c92 added TIME logger for core timing 2013-10-01 19:06:51 -04:00
ShizZy
eab69534c6 renamed GC_ALIGNED* macros to MEMORY_ALIGNED* 2013-10-01 19:05:33 -04:00
ShizZy
a79fb90d62 upgraded proj files to vs 2013 2013-09-26 22:48:31 -04:00
ShizZy
8bb0c457bc renamed from citrus to citra 2013-09-26 17:34:48 -04:00
ShizZy
5b0b60ad6b moved file_sys back to core 2013-09-25 20:59:29 -04:00
ShizZy
00287b7a65 removed <windows.h> include from common.h and added it only where needed 2013-09-23 22:09:26 -04:00
ShizZy
29cdc1df39 moved file_sys to common 2013-09-23 22:04:56 -04:00
ShizZy
1114eb9aaf added localtime_r for use on windows 2013-09-23 21:47:24 -04:00
ShizZy
a8c3c2a391 added utf8 to common module, utils for dealing with utf8 2013-09-23 21:46:59 -04:00
ShizZy
a5b31dea56 updated to chunk_file module from ppsspp 2013-09-19 23:28:05 -04:00
ShizZy
8990b51ac8 added a module for loading bootable binaries 2013-09-19 23:21:22 -04:00
ShizZy
f24f4ff978 added swap types to common 2013-09-18 23:26:13 -04:00
ShizZy
a658419946 removed CORE and LOADER from LogTypes 2013-09-18 22:35:09 -04:00
ShizZy
5417346585 added CORE and LOADER to LogTypes 2013-09-18 21:29:55 -04:00
ShizZy
cdbe6557e8 changed log CPU from PPC to ARM11 2013-09-17 22:58:55 -04:00
ShizZy
d5863c415e added default windows include 2013-09-17 22:58:18 -04:00
ShizZy
71d4fa9d3f added file platform.h 2013-09-15 22:18:16 -04:00
ShizZy
b8ca09160b renamed project to 'citrus' 2013-09-13 18:11:14 -04:00
ShizZy
9709dd2def added scm_rev_gen project to automatically create a header with the git revision on build 2013-09-13 17:46:27 -04:00
ShizZy
2161364258 cleaned up VS project files 2013-09-08 21:56:54 -04:00
ShizZy
4f5d397379 fixed some code warnings 2013-09-08 21:55:37 -04:00
ShizZy
c2867f7e14 removed unneeded dolphin paths code, fixed linker problems with common.lib 2013-09-08 20:42:03 -04:00
ShizZy
7ea22ffcdb re-enabled GetLastErrorMsg 2013-09-08 20:41:23 -04:00
ShizZy
6847033b27 updated common paths 2013-09-08 13:17:27 -04:00
ShizZy
62d873da3e start of 3DS memory map 2013-09-05 23:04:04 -04:00
ShizZy
86495a83c1 various fixes to be able to build project 2013-09-04 22:09:15 -04:00
ShizZy
4ca6d6452e added emu_window.h to define interface to drawing to a window 2013-09-04 21:00:29 -04:00
ShizZy
d9c849586e updated CMakeLists.txt file for new common files 2013-09-04 20:42:27 -04:00
ShizZy
7564d28faf replaced common code with dolphin common 2013-09-04 20:17:46 -04:00
ShizZy
72325bef1d deleted gekko's common files 2013-09-04 17:52:59 -04:00
ShizZy
27474060e1 adding initial project layout 2013-08-29 23:35:09 -04:00