zilmar
4ac4885bda
Merge branch 'master' of https://github.com/project64/project64
2016-03-04 06:19:29 +11:00
zilmar
0e0702fd42
[Glitch64] change grQueryResolutionsExt(FxI32*) to grQueryResolutionsExt(int32_t*)
2016-03-03 21:10:30 +11:00
zilmar
0a4e436c07
[Settings] Add RegisterSetting2
2016-03-03 21:07:16 +11:00
zilmar
2c648bd750
[Project64] Remove RomInformationClass.h from proect
2016-03-03 21:06:08 +11:00
zilmar
732ebbbcbf
{Projet64] Remove MemoryClass.h from project
2016-03-03 21:04:33 +11:00
purplemarshmallow
271d4699b7
replace tabs with spaces
2016-02-29 23:06:42 +01:00
purplemarshmallow
e85a14904b
[Glide64] fix up LLE
...
Based on GLideN64
World Driver Championship now works with Glide64. A bit buggy still...
2016-02-29 18:27:04 +01:00
zilmar
c12cd90928
[Project64] Fix up property sheets and project settings
2016-02-25 06:52:27 +11:00
zilmar
d05f1fe43c
[Glide64] Change the screen capture code to not use wx
2016-02-24 21:55:42 +11:00
zilmar
fc304ec1dd
[Project64] Eeprom should not try to write if read only
2016-02-24 18:10:27 +11:00
zilmar
b59abd05fb
[Glide64] replace wxDateTime with CDateTime
2016-02-24 18:07:50 +11:00
zilmar
8d6e71fa0a
[Common] Add Date Time Class
2016-02-24 17:59:29 +11:00
Nicholas
1ed5b044b3
[Project64] fix issue in 2012
2016-02-24 10:06:52 +11:00
Nicholas
83490b75b6
[RSP] Fix linkage issue
2016-02-24 10:06:11 +11:00
zilmar
4d5f70cdd9
[3rd Party] Add png for vs 2008
2016-02-23 07:21:15 +11:00
zilmar
0ef39b2e78
[3rd Party] Add png 1.4.7
2016-02-22 17:12:55 +11:00
zilmar
79349daf0b
[Glide64] make sure we have Set_log_dir
2016-02-22 17:11:13 +11:00
zilmar
818f1998e0
Merge pull request #1001 from cxd4/rsp-kill-main-errors
...
[RSP] Kill all errors related to BOOL/TRUE/FALSE.
2016-02-16 04:01:44 +11:00
6eed5ce876
[RSP] fixed all BOOL/TRUE/FALSE errors
2016-02-14 14:01:49 -05:00
9c9ffeed06
[RSP] fixed a couple more case-sensitive header includes
2016-02-14 13:52:55 -05:00
c20af1aff1
[RSP] s/BOOL/Boolean
2016-02-14 13:49:47 -05:00
zilmar
9b39879a32
[Glide64] Change display_warning to WriteTrace
2016-02-14 19:59:33 +11:00
zilmar
89162c784e
[RSP] Fix compile issues
2016-02-14 17:03:35 +11:00
zilmar
761ecedb4a
Merge pull request #1000 from cxd4/umm-ya-dunno-wot-goes-here
...
[RSP] Attempt to typedef-out WIN32 types to custom standards?
2016-02-14 16:33:22 +11:00
zilmar
5b8ae661fb
Merge pull request #999 from cxd4/rsp-dma-compiles
...
[RSP] Get Dma.c to compile without errors/warnings outside Windows.
2016-02-14 16:32:27 +11:00
zilmar
4004303854
Merge pull request #994 from cxd4/even-moar-rsp-things
...
[RSP] Get Main.cpp to start to compile outside of Windows.
2016-02-14 16:28:24 +11:00
1eb6dafd65
[RSP] Without MessageBox(), windows.h has no use here.
2016-02-13 16:42:58 -05:00
00cc4344d7
[RSP] Attempt to typedef-out WIN32 types to custom standards?
2016-02-13 15:14:44 -05:00
dd6a6fcc94
[RSP] dma.c: unresolved memcpy()
2016-02-13 15:01:41 -05:00
74b72ba294
[RSP] dma.c: Replace windows.h by using DisplayError().
2016-02-13 14:58:42 -05:00
c8dc0478f0
[RSP] dma.c: Use standard integer types.
2016-02-13 14:33:16 -05:00
e20b80e65c
[RSP] Try to introduce a new type for Booleans.
2016-02-11 20:15:19 -05:00
e14b9d5c58
[RSP] Try to use JunielKatarn's error paste to sync Main.cpp.
2016-02-11 17:23:50 -05:00
2a13b62d0f
[RSP] Remove _WIN32-isms from body def. to AsciiToHex.
2016-02-11 17:00:30 -05:00
9b5f429a97
[RSP] Get Main.cpp to start to compile (no fatal errors).
2016-02-11 16:45:04 -05:00
a774c8c5fd
[RSP] Main.cpp: Macro out #include requiring _WIN32.
2016-02-11 16:44:13 -05:00
2c5203c534
[RSP] s/opcode.h/OpCode.h
2016-02-11 16:42:40 -05:00
zilmar
caf22acb68
Merge pull request #993 from cxd4/moar-rsp-things
...
[RSP] Get Dma.c to start to compile outside Windows.
2016-02-11 21:37:05 +11:00
zilmar
d06359447e
Merge branch 'master' of https://github.com/project64/project64
2016-02-11 20:59:39 +11:00
zilmar
d70f9a6733
[Glide64] Fix up a lot of the logging code
2016-02-11 20:58:42 +11:00
1be25ea698
[RSP] s/types/Types
2016-02-11 03:33:11 -05:00
39387f6ec0
[RSP] memory.h: Get rid of #include <windows.h>.
2016-02-11 03:31:24 -05:00
88289a4ebf
[RSP] Match BOOL w/ int for ABI strictness.
2016-02-11 03:25:33 -05:00
41cf392840
[RSP] Substitute uint32_t for DWORD.
2016-02-11 03:23:15 -05:00
34ae28fdea
[RSP] Replace HINSTANCE/HWND/etc. with void* to match PJ64.
2016-02-11 03:18:00 -05:00
9ed9529cfe
[RSP] Fix #include Rsp.h for file system case-sensitivity.
2016-02-11 03:04:45 -05:00
zilmar
6bdd5dd330
[Glide64] Clean up FBtoScreen.cpp
2016-02-11 18:13:51 +11:00
zilmar
fb82959863
[Glide64] Change UNIMPMODE(); to use new trace
2016-02-10 21:50:00 +11:00
zilmar
d8e8523983
[Settings] Sync code
2016-02-10 19:57:41 +11:00
zilmar
7a638a3d7d
Merge pull request #990 from death-droid/PakInitQuickfix
...
Ensures paks are only being initialized when they have actually been …
2016-02-10 19:49:30 +11:00
zilmar
e8d5e8be9c
[Glide64] Remove LOG_KEY
2016-02-10 18:13:49 +11:00
zilmar
38ce8a3c83
[Glide64] Setup Tracing
2016-02-10 18:10:12 +11:00
zilmar
c017515247
[Glide64] Add dependancy of zlib to GlideHQ
2016-02-10 18:07:03 +11:00
zilmar
5ddc89571f
[Glide64] Get text cache to use char *
2016-02-10 18:02:20 +11:00
zilmar
3d384808bd
[Glide64] Remove SDL from TexCache.cpp
2016-02-10 17:50:24 +11:00
zilmar
236a4d2704
Merge branch 'master' of https://github.com/project64/project64
2016-02-10 17:47:17 +11:00
Emmet Young
c696cb79c3
Ensures paks are only being initialized when they have actually been selected, Transferpak needs multi controller support eventually as it currently just loads from the one singular option.
2016-02-09 18:57:30 +11:00
zilmar
a43449ea0e
Merge pull request #987 from cxd4/settings
...
[Settings] Get it building on non-Windows platforms.
2016-02-09 10:55:19 +11:00
fd4c2902d2
[Settings] added working Unix build shell script
2016-02-06 17:35:50 -05:00
56ed3cbc66
[Settings] unresolved strlen()
2016-02-06 17:34:46 -05:00
7e7f78630c
[Settings] _snprintf is #define'd in Common/Platform.h.
2016-02-06 17:33:46 -05:00
4dcc7eda5c
[Settings] Replace DWORD w/ unsigned long or maybe uint32_t.
2016-02-06 17:31:52 -05:00
393cbc09dd
[Settings] Remove windows.h to see why we need it. :P
2016-02-06 17:25:04 -05:00
3038a8f288
[Settings] #define EXPORT to abolish some MSVC-isms.
2016-02-06 17:23:27 -05:00
zilmar
26565f1a9b
Merge pull request #986 from Nekokabu/patch-2
...
disable some trying to store XXXXXXXX error
2016-02-07 06:16:53 +11:00
zilmar
c7635a8194
Merge pull request #985 from cxd4/common-shell-x64PIC
...
[Common] 64-bit needs -fPIC for sectional linkage.
2016-02-07 06:15:56 +11:00
Nekokabu
b9b64035b5
disable some trying to store XXXXXXXX error
2016-02-06 23:05:32 +09:00
37f41f2d45
[Common] 64-bit needs -fPIC for sectional linkage.
2016-02-06 05:36:44 -05:00
LegendOfDragoon
e08b1b93ec
Optimize UpdateTimers
2016-02-06 00:07:15 -08:00
zilmar
917d90b057
Merge pull request #981 from cxd4/glide-trace-string
...
[Glide64] undeclared memset and strlen in trace.cpp
2016-02-06 13:11:04 +11:00
a8fa006740
[Glide64] undeclared memset and strlen in trace.cpp
2016-02-05 18:53:58 -05:00
zilmar
3ab7328daf
Merge pull request #979 from cxd4/patch-1
...
[Common] leftover remnant of Win32 command shell
2016-02-06 06:56:09 +11:00
zilmar
3bc6aa55cc
Merge pull request #978 from cxd4/glitch-WriteTrace
...
[Glitch64] unresolved reference to old macro LOG()
2016-02-06 06:55:07 +11:00
zilmar
bdeeef1fd5
Merge pull request #977 from cxd4/glitch-includes
...
[Glitch64] need forward slashes for C standard paths
2016-02-06 06:54:35 +11:00
cxd4
1580876b15
[Common] leftover remnant of Win32 command shell
...
I found out the hard way while getting `libglitch64.a` to link into PJ64 Glide64 on Linux that I was getting an 8-byte static library file. This was because the Unix shell variable `$OBJ_LIST` was null, due to using the `set` keyword which was a result of lazy copy pasta while porting my MinGW script to compile the PJ64 Common library on Windows.
2016-02-05 03:32:43 -05:00
3609ca388e
[Glitch64] unresolved reference to old macro LOG()
2016-02-05 02:57:00 -05:00
8e11a9e1ae
[Glitch64] need forward slashes for C standard paths
2016-02-05 02:46:48 -05:00
ab55df84e2
[Glide64] fixed yet again the case-sensitive include
2016-02-04 20:48:44 -05:00
zilmar
2ec7a92dfc
Merge pull request #973 from cxd4/mempak-OCD
...
[Project64-core] OCD clean-ups with the mempak unit
2016-02-05 08:23:14 +11:00
zilmar
e5cd8765f8
Merge pull request #972 from cxd4/mempak-stdio
...
[Project64-core] Have stdio.h to guarantee fopen() and fclose().
2016-02-05 08:21:06 +11:00
cf221dc21b
Don't use lowercase digits in hex.
2016-02-04 14:47:47 -05:00
3dbe8d1494
padding by saying + 0 for consistency
2016-02-04 14:40:45 -05:00
ebbecdef7e
0x8000 = 32768 = pages * bytes_per_page
2016-02-04 14:39:43 -05:00
8be4b5bb0e
Use size_t.
2016-02-04 14:37:54 -05:00
b50313da98
Use sizeof() instead of re-pasting a size literal.
2016-02-04 14:37:27 -05:00
a8116b0908
Technically, Initialize[] is an array, not a pointer.
2016-02-04 14:35:00 -05:00
17a2b6e8fc
Make it const since we'll never write to it.
2016-02-04 14:34:07 -05:00
25c537613e
*Statically* allocate mempak page 0 buffer.
2016-02-04 14:32:43 -05:00
ab7671964b
Re-express Mempaks[][] allocation as pages * bytes_per_page.
2016-02-04 14:30:23 -05:00
41ff26122a
Have stdio.h to guarantee fopen() and fclose().
2016-02-04 14:16:46 -05:00
53e07d02e2
Have <memory> included to guarantee std::auto_ptr.
2016-02-04 14:09:56 -05:00
zilmar
d6722faee6
[Glide64] Clean up GlideHQ/TxHiResCache.cpp
2016-02-05 04:35:02 +11:00
zilmar
d8a35cbfba
[Glide64] Clean GlideHQ/TxFilter.cpp
2016-02-05 04:32:36 +11:00
zilmar
b2541f40bd
[Glide64] Cleanup GlideHQ/TxDbg.cpp
2016-02-05 04:31:18 +11:00
zilmar
0ebcf6d608
[Glide64] Clean up GlideHQ/TxCache.cpp
2016-02-05 04:28:21 +11:00
zilmar
612bbb71e5
[Project64] Add GBCart.cpp to vs2008
2016-02-04 22:03:16 +11:00
zilmar
1c10025848
[Project64] Add N64System\Mips\Transferpak.cpp to vs2008 project
2016-02-04 21:57:34 +11:00
zilmar
77665d7278
[Glide64] Remove 3rdParty/glide
2016-02-04 21:50:43 +11:00
zilmar
a99a64dc03
[Glide64] Fix up missing log message
2016-02-04 21:49:54 +11:00
zilmar
7fe12881df
[Project64] Use Common/stdtypes.h instead of stdint.h
2016-02-04 21:28:07 +11:00
zilmar
3914220a30
Merge pull request #965 from death-droid/TransferPack
...
Transfer pack
2016-02-04 21:24:47 +11:00
zilmar
4921024636
[Glide64] New trace method
2016-02-04 21:22:19 +11:00
zilmar
e9c3d01d38
[Glide64] Clean up OGLcombiner.cpp
2016-02-04 19:45:53 +11:00
zilmar
ee5a59910c
[Glide64] Clean up OGLgeometry.cpp
2016-02-04 19:34:02 +11:00
zilmar
009dfa94f3
[Glide64] Clean up OGLtextures.cpp
2016-02-04 17:08:24 +11:00
Emmet Young
494ad71352
Change declaration, we should only need int.
2016-02-04 12:57:09 +11:00
zilmar
eab47fdd82
[Glide64] Clean up OGLglitchmain.cpp
2016-02-04 08:21:30 +11:00
Emmet Young
e6b1fd3aec
Fix up reading and writing of the RTC data to the save file.
...
Correct the RTC emulation behaviour, made it more like NRAGES, various emulators i was basing mine off seemed to not correctly update the RTC.
2016-02-04 00:33:03 +11:00
Emmet Young
dd7cf4af10
Missed two frees, when swapping out for deletes
2016-02-03 13:42:06 +11:00
Emmet Young
26d4bea1f1
Switch to using an auto_ptr for our buffers, and switch fopen/fwrites. to make use of the CFile class.
2016-02-03 13:34:52 +11:00
Emmet Young
696d419e5b
Improve behaviour of MBC3 if statements.
2016-02-02 19:44:18 +11:00
Emmet Young
aab625734d
Fix up spelling mistake in Tansferpak.cpp naming,
2016-02-02 15:09:47 +11:00
zilmar
c59b716e8b
[Glide64] Fix 2008 project
2016-02-02 03:47:09 +11:00
Emmet Young
1ddeb52f7f
Allow transferpaks to be set through the RDB. Still need to implement the actual settings in the GUI
2016-02-01 23:41:46 +11:00
Emmet Young
258a5a0eb8
Transferpak: Add support for RAM saving, and RTC saving (Visual Boy Advance format)
...
Remove UpdateRTC() till I can get a better idea if the RTC code works properly.
2016-02-01 19:58:37 +11:00
zilmar
dba3b94dfb
[Glide64] Get Settings to be a class instead of a struct
2016-02-01 19:56:25 +11:00
zilmar
2b6fdc000e
[Project64] Add more logging
2016-02-01 17:33:19 +11:00
zilmar
b8bdf17499
[Project64] Add Notification on directory changed
2016-02-01 17:31:33 +11:00
zilmar
2e70c734b5
[Project64] Add Directory_Log setting
2016-02-01 17:30:22 +11:00
zilmar
e2f9881864
[Project64] fix log message text in Plugins/PluginList.cpp
2016-02-01 17:10:43 +11:00
zilmar
c23f5fe955
[common] Add #include "StdString.h" to Common/LogClass.h
2016-02-01 17:10:04 +11:00
zilmar
d70ad198b4
Merge branch 'master' of https://github.com/project64/project64
2016-02-01 17:05:45 +11:00
zilmar
6aaf0f0f8e
[Project64] Add #include <map> to Settings/SettingsClass.h
2016-02-01 17:05:30 +11:00
zilmar
a985d587bd
[Project64] 7Zip just on windows
2016-02-01 17:04:05 +11:00
zilmar
4f61d7c5a3
[Project64] Get MempakNames to set path in CPath constructor
2016-02-01 17:03:19 +11:00
zilmar
649cc48598
[Project64] Add #include <stdlib.h> for strtoul
2016-02-01 17:02:14 +11:00
zilmar
ee51201eae
[Glide64] Get ext_ghq_init to have texture dir is char *
2016-02-01 17:01:11 +11:00
zilmar
71710be0b8
[Project64] Add some logging to AppInit
2016-02-01 16:57:59 +11:00
luigiblood
6469b523b4
[64DD] Add brackets for if g_DDRom == NULL
2016-02-01 01:38:27 +01:00
luigiblood
f63b746c73
[64DD] Load 64DD IPL on g_DDRom seperately
...
Fixes double g_Rom delete which makes Windows not happy.
2016-02-01 01:31:14 +01:00
luigiblood
d2d611c137
[64DD] Only Head 0 Track 6 is supposed to fail.
2016-01-30 22:23:27 +01:00
Emmet Young
74d3825870
Basic implementation of the RTC for the Transferpak.
...
Unable to properly test this due to Project64 not being able to emulate the co-processor - http://www.emutalk.net/threads/54598-Pok%C3%A9mon-Stadium-%28Pocket-Monster-Stadium%29-requires-RSP-emulation @project64 @LuigiBlood @LegendOfDragoon
2016-01-31 01:52:26 +11:00
Emmet Young
ff5fcf6d33
Basic implementation of the Transferpak, is now partially working.
...
Have to re-implement the RTC and ensure the mbc emulation of all current carts is accurate.
Settings implementation needs to be done as well.
This code is based on work from NRAGE and Bobby Smiles work on Mupen64plus's implementation.
2016-01-29 22:17:59 +11:00
zilmar
5cad324699
Merge pull request #958 from LuigiBlood/64dd_2
...
64DD IPL ROM Recompiler support
2016-01-29 10:06:21 +11:00
luigiblood
03bd97c46b
[Recompiler] Fix COP0_MT() Cause case
...
Results in 64DD IPL ROM fully working in Recompiler.
Thanks zilmar!
2016-01-28 23:59:53 +01:00
zilmar
5f0a77f897
Merge pull request #957 from cxd4/BOOL-does-not-name-a-type
...
[Settings] InitializeSettings() can return bool.
2016-01-29 08:02:44 +11:00
a591fefccb
[Settings] InitializeSettings() can return bool.
2016-01-28 15:21:23 -05:00
d267a1b895
Include stdarg.h for va_start and va_end.
2016-01-28 15:07:00 -05:00
b759a60417
Include string.h where needed.
2016-01-28 15:00:13 -05:00
fa90c2a472
s/config.h/Config.h
2016-01-28 14:37:37 -05:00
zilmar
6b50bc4ff4
Merge pull request #950 from death-droid/PifRAMCleanupChanges
...
Prepare the emulator for easier implementation of the transferpak, pa…
2016-01-29 05:13:06 +11:00
zilmar
4203cbd2ef
[Common] Make sure we always have a path in CPath::SetComponents
2016-01-29 04:34:50 +11:00
Emmet Young
c6fa59ac3a
Made a slight mistake when porting over from my old branch.
...
Mempak and Rumblepak will work fine again.
2016-01-28 22:51:48 +11:00
Emmet Young
e879431606
Prepare the emulator for easier implementation of the transferpak, pass Command[5] directly into the Pak functions, and also generate the address beforehand.
2016-01-28 21:58:14 +11:00
zilmar
3a1fc904c6
[Project64] Code cleanup and added some more log messages
2016-01-28 20:40:08 +11:00
zilmar
a6bfe74a28
[Project64] Be able to pass base dir to app init
2016-01-28 20:37:44 +11:00
zilmar
8df90936f8
Merge pull request #944 from LuigiBlood/64dd_2
...
Fix Disk.cpp time/date code & F-Zero X (J) RDB update
2016-01-28 17:51:00 +11:00
Emmet Young
643a684c77
Change up the way Mempaks are meant to work, use the standard file functions. Mempaks are now loaded in when the game launches, and file handles are only opened durring read and writes
2016-01-28 14:02:05 +11:00
luigiblood
5505db5201
Fix Disk.cpp time/date code
2016-01-27 22:41:31 +01:00
zilmar
72e6928ea8
[Project64] Remove duplicate Rdb_FixedAudio
2016-01-27 20:54:22 +11:00