Commit Graph

95 Commits

Author SHA1 Message Date
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