Commit Graph

2720 Commits

Author SHA1 Message Date
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
zilmar cfbf695f26 Merge pull request #963 from LuigiBlood/64dd_2
[64DD] Load 64DD IPL on g_DDRom seperately
2016-02-01 11:40:38 +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
zilmar 02d94ce57b Merge pull request #961 from LuigiBlood/64dd_2
[64DD] Only Head 0 Track 6 is supposed to fail.
2016-01-31 12:18:23 +11:00
luigiblood d2d611c137 [64DD] Only Head 0 Track 6 is supposed to fail. 2016-01-30 22:23:27 +01:00
zilmar 4103e9459f Merge pull request #960 from AmbientMalice/patch-30
R6 software depth buffer enable
2016-01-30 20:02:41 +11:00
AmbientMalice f252ba8c8e R6 software depth buffer enable
Fixes lens flares. Game still has some depth issues, possibly caused by swap modes.
2016-01-30 17:59:55 +10:00
zilmar a08ae5b8cd Merge pull request #959 from dsx-/master
minor rdb edits
2016-01-30 05:30:12 +11:00
dsx- 4b195a6943 king hill/twisted edge plugin note 2016-01-29 22:06:52 +08:00
dsx- 0ce0c93479 64 de hakken plugin note 2016-01-29 21:52:30 +08:00
dsx- f208016599 king hill minor correction 2016-01-29 21:51:42 +08:00
dsx- 8585c37fd6 Revert "revert twisted edge change"
This reverts commit 11f4bb9175.
2016-01-29 21:48:50 +08:00
dsx- 6e8c0a5ddc Revert "64 de hakken plugin note"
This reverts commit 6e19e48448.
2016-01-29 21:48:26 +08:00
dsx- 11f4bb9175 revert twisted edge change 2016-01-29 21:31:36 +08:00
dsx- 6c2ba343c4 conker rdb remove period 2016-01-29 20:34:08 +08:00
dsx- a9e01ec074 tetrisphere remove plugin note 2016-01-29 20:28:03 +08:00
dsx- 5da6e445e6 winback rdb remove period 2016-01-29 20:27:27 +08:00
dsx- 7ca5b91998 rat attack minor rdb edit 2016-01-29 20:26:17 +08:00
dsx- 17beb79c95 nba hangtime plugin note 2016-01-29 20:25:28 +08:00
dsx- 6e19e48448 64 de hakken plugin note 2016-01-29 20:24:13 +08: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 6e1ea7cba7 [RDB] 64DD IPL ROM works on Recompiler (Compatible) 2016-01-29 00:03:53 +01: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
zilmar 36efe34b30 Merge pull request #956 from cxd4/fix-glide-unix
[Glide64] small updates for fixing compile errors on non-Windows
2016-01-29 08:02:20 +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
zilmar 5b00932156 Merge pull request #946 from death-droid/MempakFix
Change up the way Mempaks are meant to work, use the standard file fu…
2016-01-28 17:43:35 +11:00
zilmar 2885e497bf Merge pull request #945 from AmbientMalice/patch-29
Change Rainbow 6 to use old buffer swap mode.
2016-01-28 17:41:34 +11:00
zilmar 154b94008d Merge pull request #949 from cxd4/corrupt-commits
Don't force other contributors to make unreadable PRs.
2016-01-28 17:41:10 +11:00
22256d6b17 XPM is not a binary-encoded image format; it's text. 2016-01-28 00:53:41 -05:00
7e8d3d8a3b MSVS stuff is indifferent to LF or CRLF, and Windows is CRLF. 2016-01-28 00:53:07 -05:00
7d10c64d5d Don't force other contributors to make unreadable PRs. 2016-01-28 00:49:34 -05:00