dc65c0a075
Resolve merge conflicts from `Controller Plugin.cpp`.
2015-11-16 21:01:54 -05:00
6fd2fa0f4a
[N-Rage] Get resource script linked w/ MinGW for config GUI.
2015-11-16 20:27:44 -05:00
1f233320ba
[N-Rage] Include windows.h, not wtypes.h, for Windows API types.
...
<wtypes.h> may include all the BOOL/DWORD/etc. stuff as a low-level MSVC header, but it is not obligated to do so per the low-level header specifications for other compilers, such as (evidently) MinGW.
2015-11-16 19:12:57 -05:00
5af1cfd3c2
[N-Rage] only need WBEM dependency in 1 .cpp, not a .h
2015-11-16 18:47:26 -05:00
0e67591be6
[N-Rage] fixed ARRAYSIZE() #define when missing headers
...
The old code only cared about if the macro was already defined (then #undef and re-define it). If it was NOT already defined, it just ignored the problem and causes unresolved compile-time symbols.
2015-11-16 18:30:11 -05:00
61866f5b04
[N-Rage] MinGW links with -ldinput8, -mwindows and subsets.
2015-11-16 16:30:21 -05:00
a0ac5d6d33
Merge pull request #758 from cxd4/CIC-DMA-use-SW
...
Express initial CIC DMA poke in terms of the SW operation.
2015-11-17 05:03:31 +11:00
72d63ae62c
Move all the repeated stuff out from every switch case.
2015-11-16 10:21:50 -05:00
9803d3fb01
Don't force pointer aliasing risks; just call SW.
2015-11-16 10:13:36 -05:00
d5bd45df4a
[Artwork] Add publisherlogo.psd
2015-11-16 20:17:50 +11:00
d299049642
Merge branch 'master' of https://github.com/project64/project64
2015-11-16 07:13:45 +11:00
9e10486e2c
[Project64] Pass main window object to plugin config
2015-11-16 07:13:09 +11:00
fbe62d9567
[Project64] Clean up Controller Plugin.cpp
2015-11-16 07:11:05 +11:00
c317c645bf
[Project64] Clean up Plugin Class.cpp
2015-11-16 07:10:01 +11:00
f78b812d66
[Project64] Remove CNotification::MakeWindowOnTop
2015-11-16 07:07:02 +11:00
1a4166a1de
[Project64] Get N64 Rom Class.cpp to use standard types
2015-11-16 07:05:55 +11:00
057e469e96
Merge pull request #755 from samuelyuan/master
...
Fixed "Save Slot (%s) selected" Text
2015-11-16 05:56:09 +11:00
63096c99d3
[Project64] Clean up N64 Rom Class.cpp
2015-11-15 20:56:34 +11:00
165bdc160b
[Prject64] Move display rom information out of N64 Class.cpp
2015-11-15 20:54:23 +11:00
3a80cd7138
[Project64] Move thread code to Emulation Thread.cpp
2015-11-15 20:51:44 +11:00
6eae2b05e2
Merge remote-tracking branch 'refs/remotes/project64/master'
2015-11-15 00:30:03 -05:00
3024d7c524
[Project64] Get N64 Class.cpp to use standard types
2015-11-15 16:20:22 +11:00
7d7026c33d
[Project64] Add ability to monitor Game Cpu Running to Gui
2015-11-15 15:44:40 +11:00
8aa5b6ef47
[Project64] fix up spaces in CN64System::StartEmulationThread
2015-11-15 14:51:21 +11:00
2f3998d9a6
[Project64] more fix up of Reg Info.cpp
2015-11-15 14:50:05 +11:00
a0b25444f7
[Project64] Clean up Reg Info.cpp
2015-11-15 14:45:09 +11:00
d7c7882244
[Project64] Fix up headers
2015-11-15 14:27:59 +11:00
4b43afe275
Added class to format wide strings
2015-11-14 22:12:24 -05:00
ec31d79c23
[Project64] Cleanup Code Section.cpp
2015-11-15 13:27:06 +11:00
d740aaf350
[Project64] Use standard types in Eeprom.cpp
2015-11-15 13:20:18 +11:00
68ad452a07
Added string back in
...
It was deleted earlier due to a merge conflict.
2015-11-14 20:04:42 -05:00
64e0dae30f
[Project64] Change Dma.cpp to use standard types
2015-11-15 11:52:24 +11:00
7f0deb2ced
Merge remote-tracking branch 'refs/remotes/project64/master'
2015-11-14 19:44:50 -05:00
937625f0c6
Merge remote-tracking branch 'refs/remotes/project64/master'
...
Conflicts:
Source/Project64/Multilanguage.h
Source/Project64/Multilanguage/Language Class.cpp
2015-11-14 19:44:42 -05:00
87f13cbe4b
[Project64] Get Audio plugin to use standard types
2015-11-15 11:35:38 +11:00
089b036cfe
[Project64] Cleanup Audio.cpp
2015-11-15 11:31:56 +11:00
03a41c7cd3
[Project64] Get Interpreter CPU to use standard types
2015-11-15 11:29:15 +11:00
7b10bc6725
[Project64] Add appinit to vs2008 project
2015-11-15 09:13:29 +11:00
89b197be43
[Project64] Clean up Interpreter CPU
2015-11-15 09:08:30 +11:00
46fea05262
[Project64] Get settings to use standard types
2015-11-15 08:49:08 +11:00
68513c1101
[Project64] Cleanup Debug Settings.cpp
2015-11-15 08:32:57 +11:00
d9e13d4385
[Project64] Cleanup Game Settings.cpp
2015-11-15 08:14:37 +11:00
bf9fad6737
[Project64] Clean up N64System Settings.cpp
2015-11-15 08:10:55 +11:00
ce062e70ed
[Projet64] Cleanup Notification Settings.cpp
2015-11-15 08:07:53 +11:00
5be42089b0
[Projec64] Clean up Recompiler Settings.cpp
2015-11-15 08:05:48 +11:00
0745cab320
[Project64] update Debugger interface
2015-11-15 07:59:12 +11:00
56ebb74588
Merge branch 'master' of https://github.com/project64/project64
2015-11-15 07:57:03 +11:00
9e9189c192
[Project64] move program inir/cleanup code in to a separate file
2015-11-15 07:56:40 +11:00
b8ade27bab
[Project64] Clean up Multilanguage.h
2015-11-15 07:55:26 +11:00
1f6ac35166
[Projec64] Change language class to use standard types
2015-11-15 07:54:55 +11:00
unknown