Commit Graph

555 Commits

Author SHA1 Message Date
hrydgard
aff0f1fbe3 Consolidate the three implementations of Decode5A3 found in Core into one. Fix some warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2364 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 12:43:25 +00:00
LPFaint99
e5cf9c8b8c Fix for read from raw drive on some machines,
must have been a fluke that it worked for me and a few others
thanks to shuffle2 and daxtsu for testing patch

some linux compile fixes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2360 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 07:52:02 +00:00
John Peterson
2a94635523 OpenGL: Added option to build without WxWidgets in Windows to, if it has anything to do with the FreeLibrary() hanging. It doesn't seem to do, but now it's easier to compile without it at least.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2358 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 05:21:54 +00:00
LPFaint99
db691a4f0d linux build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2357 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 04:26:09 +00:00
John Peterson
fc6a7c47d5 Core Stop and Start: Fixed stop and start again by avoiding FreeLibrary() of the OpenGL plugin, and avoiding a crash in its ShutDown() function. You need to use SETUP_FREE_PLUGIN_ON_BOOT to compile with this option that works on my system. Also, I noticed that I don't need the SETUP_AVOID_CHILD_WINDOW_RENDERING_HANG anymore, I can now delete the g_EmuThread without having it hanging in its waiting function.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2356 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 04:24:53 +00:00
LPFaint99
5057d3b446 Linux build fix.. I think..
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2355 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 04:21:32 +00:00
LPFaint99
341ac26401 MemcardManager general cleanup, ini settings fixes
disallows multiple formats for icons

adds export all saves to right click menu

sets exported save name to gamecode+filename.gci


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2353 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 03:23:48 +00:00
LPFaint99
3d0fcfaaac Enable Loading backup from drive for GC for windows
takes about 60-90 seconds on loading
about the same speed ingame as running from the hard drive
changed to the correct flag for CreateFile

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2352 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 02:39:16 +00:00
fires.gc
5c2694a629 added support to load WAD files of the WII
the WiiWAD loader encrypts the WAD, loads the NAND AppLoader and executes it. The NAND Loader will load more parts of the WAD to memory and execute them.

Some WADs show the loading screen but hanging because the BT devices cant be initialized. Dolphin is not able to connect to devices that arnt validates per SYSCONF. Perhaps a global flag is wrong or missing or we have to preload the SYSCONF by hand (or fix/improve the BT handling :))

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2348 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 00:40:52 +00:00
omegadox
2b48640441 small cleanup in OGL/VideoCommon and small fix to ARCodeAddEdit by slink
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2346 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-21 23:56:10 +00:00
LPFaint99
9cfa4e9385 Adds IsDrive to FileUtil for win32,
Adds booting from drive to gui. disabled as it is currently too slow unless it is a virtual drive

Changes DriveUtil to start checking at D: as it is unlikely that a, b, or c will be a cd/dvd drive

Addes DriveBlob functions, untested on linux/osx probably needs more work

Removes duplicate message from EXI_DeviceMemoryCard.cpp when creating a brand new memcard



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2345 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-21 23:44:40 +00:00
daco65
6222414ba5 Killed the issues column and made emulationstate "Problems" provide more info when its set in the gameini. the config looks a bit ugly imo but thats cause im horrible in such stuff :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2340 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-21 14:40:34 +00:00
hrydgard
6cd34b318f The Mega Change Of Doom - or, fixing Stop. Almost. At least it's better than before. However, the OpenGL plugin seems to lose textures a lot between game restarts :P I think the GL plugin needs to do a lot more cleanup.
This change also includes tons of minor code formatting cleanup. Yeah, should've separated it ... sorry :(

Kills the old CPUCompare support. I'll resurrect it if I need it again, right now it mostly clutters the code.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2321 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-20 22:04:52 +00:00
John Peterson
59734ddc86 Emulated Wiimote: Added game specific Wiimote cursor configuration. The IR pointer settings will be saved for the ISO id of the ISO that is loaded. This is necessary because there is no common way of treating the IR pointer positions. The IR data use a virtual resolution of 1024 x 768, but there is no consistency of where such a point is on the screen.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2314 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-20 03:13:22 +00:00
XTra.KrazzY
4883727384 Clarified Patch Add/Edit, added AR Add/Edit by slink3
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2313 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-20 00:07:35 +00:00
nakeee
5cf828c7b9 Compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2302 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-18 00:08:40 +00:00
hrydgard
e010ef25da Clean up access to PowerPC::state. Some warning fixes. Restore hold-tab-to-release-throttle on Windows. Fix some project settings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2297 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-17 22:48:16 +00:00
hrydgard
e11fa577b9 Also rename the projects as seen within VS.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2291 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-17 21:57:50 +00:00
hrydgard
692293550b Remove "WX" from all executable names, since the old non-wx version is dead and buried for two millennia or so (svn revs, not years ;)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2290 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-17 21:44:59 +00:00
tmator
7a4f21d8c4 try to fix non gui version
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2289 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-17 20:28:49 +00:00
magumagu9
82a10c9692 Fix jpeterson breakage.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2276 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-16 09:26:47 +00:00
John Peterson
9afd7fb620 Rerecording: Wind back the frame counter in the status bar when a save state is loaded. Issues: The frame updates do currently not occur as often as the input updates. The input updates occur more frequently, perhaps closer to 60 times per real seconds.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2274 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-16 07:17:34 +00:00
John Peterson
718aa585e2 Rerecording: Added frame step function and status bar for the input recording. Turn on frame stepping with Ctrl, step with Space. Build the Rerecording version with the setting in Setup.h.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2273 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-16 06:18:18 +00:00
Shawn Hoffman
5e80ca1526 finish the banner part of ISOProperties.cpp
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2241 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-14 17:32:03 +00:00
John Peterson
94583cbab0 DSP HLE: Fixed a sound problem with a new Setup.h option. For some reason all the SoundSyncEvent->Set() caused a lot of static for me in Wario Land.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2236 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-14 01:07:20 +00:00
John Peterson
68f39cb287 nJoy:
1. Circumvent the IDirectInputDevice2::SetDataFormat() error when opening the configuration window to.

2. Fixed the Allow out of focus input option again

3. Allow changing of the mapped pads while a game is running

4. Prevented crashes or problems from any combination of having the configuration window open when a game is started or stopped

5. Fixed a crash that would occur after nJoy was started with a connected pad, then stopped, and all pads disconnected, then started again

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2215 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-11 10:30:02 +00:00
John Peterson
d0a01f449b Last commit: Typo
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2175 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 15:31:00 +00:00
John Peterson
3e53828406 MusicMod: Moved it from Branches to Externals, I guess there usually is no Branches dir in the trunk dir, so this may look a little better
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2174 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 15:29:35 +00:00
hrydgard
5822e284f3 Add Release_JITIL configuration to use magumagu's JIT instead under windows (currently 32-bit only) (this is intended to be temporary). Add comment about crashes with JITIL in Burnout2 and Animal Crossing. Some warning disables and cleanups.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2145 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 13:09:58 +00:00
John Peterson
ca0e807db6 Wiimote: Fixed the speaker status bar status, the status is [Green] [Blue] [Green] that means [On/Off] [Muted/Unmuted] [Activity]
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2142 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 12:27:04 +00:00
John Peterson
f610f7e197 Video and DSP plugin management: Fixed Stop and Start again, it was necessary to call FreeLibrary() on Start instead of on Stop, I don't know why but that's how it works
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2139 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 10:09:26 +00:00
hyperiris
d5bcb81872 this should be OK: display some default info when no save exist
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2133 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-07 17:31:35 +00:00
John Peterson
fcdd2a8e17 Wiimote:
1. Fixed the dual mode. You should now be able to change between the real and emulated Wiimote at any time, even when the Nunchuck is connected. It also supports third party Wireless Nunchucks that never sends any calibration values. The Nunchuck status should be automatically updated. The Nunchuck stick may get stuck, but that should fix itself if you disconnect and reconnect again. The only important problems seems to be that the real Wiimote fails to answer sometimes so that the Core functions disconnect it.

2. Began looking at how to reconnect the Wiimote after an unwanted HCI disconnect command

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2129 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-07 03:16:41 +00:00
Shawn Hoffman
60b25def18 Allow changing of the debugger font and some cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2127 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-06 18:18:20 +00:00
hrydgard
81631d8452 Nothing important, just cleaning my dev folder. (mostly formatting changes, removed a superfluous strlen from logging in ogl plugin)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2126 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-06 18:04:24 +00:00
hyperiris
825919aaf8 fix display wii game name and description (only WIN32 working).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2125 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-06 16:53:22 +00:00
XTra.KrazzY
7cc80c32f9 Fixed Wiimote config window closing (Don't use EndModal if you aren't using ShowModal)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2117 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-05 05:44:16 +00:00
hyperiris
4649416822 linux build fix.
thanks nakee points out that wxChar is not char under Linux,
and I guess wxString::FromAscii will cut off > 127 characters, so I change it to wxString::From8BitData.
I hop it works, please check it under other platform.

BTW: If dolphin can not run, plz clean up your cache directory, delete all cache file.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2091 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 16:04:23 +00:00
hyperiris
9e3fed40f2 game name and description WIP: cache all 6 languages, so we don't need refresh cache after we changes language.
move some WIN32 code to CGameListCtrl.
nakee, please check linux build, sorry I've not enough time to setup a linux dev environment.
and, who can read German helps me to test game name and description display, thanks.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2090 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 15:03:34 +00:00
John Peterson
f3e5f06def GameCube Configuration: Changed "null" to "<Nothing>", I think it's easier to understand
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2085 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 09:31:06 +00:00
nakeee
ace2ea395d compile fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2077 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-02 22:47:29 +00:00
Shawn Hoffman
cfc128abff reorganize SI and EXI interfaces, add a gui for picking devices. XK, that was annoying. Now, you can deal with SI_Channel. This commit changes how memcards are handled a little, now they are .REGION.raw, like .USA.raw, and can be in any dir.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2075 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-02 22:29:33 +00:00
omegadox
ca741b2526 More SDIO WIP Code: Added ground work for SDCard Mounter wxDialog
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2067 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-01 20:20:58 +00:00
nakeee
f8064316b1 Some code clean up
console now prints to file and stderr on windows someone feels like creating a wxw version?



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2046 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-31 21:49:06 +00:00
Shawn Hoffman
121be22532 buildfix and some cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2026 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-28 16:51:05 +00:00
XTra.KrazzY
7bc798b7f1 Fixed ISOProperties window crash. Please don't kill modals with Destroy() but with EndModal().
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2020 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-28 10:21:18 +00:00
John Peterson
fa7e857161 nJoy: Readded some fixes to nJoy (Notice: these changes have nothing to do with the argument earlier. These are only for fixing nJoy (point one and three in the 1991 revision)). Now opening the Wiimote plugin doesn't crash either (it was just a typo in GetWiimote()).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2000 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 12:09:30 +00:00
omegadox
8f98f0b778 Some warning and code cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1998 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 00:45:46 +00:00
hrydgard
70bc8167f8 Warp back to 1983!!! (rev 1983, that is, not the year :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1997 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 21:28:55 +00:00
John Peterson
63ad74f9e8 nJoy and PluginManager:
1. Avoided LoadLibrary() and FreeLibrary() in favor of using an existing LoadLibrary() because of an unresolved crash related to LoadLibrary() and nJoy. After several times of LoadLibrary() and FreeLibrary() of nJoy these seems to be some kind of memory corruption that brings up several error boxes from different places (not just nJoy) and then cause a crash.

2. Slowed down the moving of the pad initialization to InputCommon. I'm not against InputCommon at all, but I have to spend some more time with it before it works on Windows

3. Partly fixed a somewhat frequent failure of nJoy with SDL 1.3 that would give a strange DirectInput error message and cause the pads to not function. It's still present before the nJoy config windows is opened. It's only fixed on booting a game.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1991 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-23 10:00:59 +00:00
hyperiris
189285f071 continue working on display gamecube game name and description.
now we can select Config -> General -> Game List Language to choose the language of PAL games for displaying

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1979 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-22 07:42:17 +00:00
hyperiris
8f4d58e082 UI: makes dolphin displays japanese region games' names and their descriptions.
only work on windows and asian language support installed.
(without fonts and codepages, we can not display text, I'm sure).
BTW, I only test on GC games, I've no Wii games now, 
and .\User\Cache directory must be cleared to work (delete all cached files)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1972 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-21 16:31:44 +00:00
LPFaint99
0ccdb44016 Oops... that was not supposed to be checked revert
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1968 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-21 03:51:07 +00:00
LPFaint99
f703046e01 MemcardManager:
Fix most banner issues that I have seen.
1. Banners from any imported sav file
2. Banners for Time Splitters 2

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1967 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-21 03:49:38 +00:00
John Peterson
d39819c4b5 DebuggerWX: Added jit block linking option to the code window
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1958 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 16:52:46 +00:00
Shawn Hoffman
05a5333c80 fix build and change /EHsc to /EHa. jakestine (pcsx2-playground) says it is the Right Thing To Do.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1942 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 23:01:17 +00:00
Shawn Hoffman
3d2570f53d revert game-specific hack which broke mp3. see r1805 r1806. change dolphinwx so it's not sized retardedly anymore...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1938 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 20:43:47 +00:00
nakeee
015fc11baf Remember last iso (fix)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1937 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 20:06:03 +00:00
John Peterson
14b7f6d0fd Multiple pad plugins: Fixed configuration
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1924 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 05:16:05 +00:00
John Peterson
d60fea1d99 SerialInterface and pads: Allow MAXPADS lower than 4
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1923 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 03:45:28 +00:00
Shawn Hoffman
5708e14a0e don't fool with sysconf if you're booting a gc game, and add back ability to double click on initial gamelistitem in order to add a GCMPath.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1922 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 01:30:54 +00:00
John Peterson
8ca3b9a2ed Frame: Turn on the resize gripper again
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1919 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-18 11:43:10 +00:00
John Peterson
f9ffbd8c32 BootManager: Cosmetic changes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1917 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-18 09:49:28 +00:00
nakeee
38f8221bfc reverted 1914, but updated the default handler instead
windows now suppose to use it until we fix the debug window


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1915 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-18 08:47:24 +00:00
John Peterson
53d85bce9e Main: Readded windows MessageBox
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1914 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-18 08:37:44 +00:00
nakeee
a6447d1758 some clean up but there are too many references to g_CoreStartupParameter directly:(
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1912 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-18 01:45:53 +00:00
nakeee
8fdf439c9a Core now uses SConfig and not startup params
Please check everything is working well


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1911 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-18 00:45:48 +00:00
Shawn Hoffman
fefc325a55 windows build fix for r1905
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1906 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-17 23:50:22 +00:00
nakeee
4433e06447 Move Config.cpp to Core renamed it to ConfigManager
Todo: Use it from core.cpp instead of the params


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1905 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-17 23:41:21 +00:00
John Peterson
b3ac9710e1 Last commit: Restored build events to the DolphinWX project
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1891 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-17 14:43:18 +00:00
John Peterson
ae9cfbd8e3 Common: Moved Windows console functions to common
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1887 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-17 14:28:09 +00:00
Shawn Hoffman
ba8c2aa7e4 nakee's work on dolphin events. Also get wxw out of logmanager. This commit wants your comments
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1875 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-15 06:48:15 +00:00
LPFaint99
aced3c00fd Some WIP work on MemcardManager, nothing for enduser.
Mostly to avoid using a hexeditor to look at dir entries

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1874 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-15 06:06:30 +00:00
Shawn Hoffman
1ba2708bbd put the handy items on the first page of ConfigMain. Fix for plugins not loading on first boot. We should figure out how to get a pointer to the main app (see OGL main.cpp line 118)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1870 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-14 16:36:43 +00:00
LPFaint99
14984a916d Remove dependency of ATLMFC from direct 3d9 plugin and main dolphin app, dependency still exists in DSP_HLE and DSP_LLE
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1864 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-14 05:07:53 +00:00
tmator
6da0386bd6 now we can play with keyboard on osx, enjoy
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1862 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-13 14:30:05 +00:00
tmator
2d586139bc cocoa event wip, i'm tired i'll continue tomorrow
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1860 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-13 00:34:36 +00:00
tmator
4fd0f3035a cocoa event wip
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1859 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-12 23:59:27 +00:00
tmator
a255ea66cf first step to get cocoa events
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1857 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-12 20:52:45 +00:00
daco65
ffdfc86633 i euh...made another mistake :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1854 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-11 22:43:06 +00:00
daco65
394b040f61 placed the issues column to the back. i still got huge plans for the notes column but for now this will do.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1852 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-11 20:29:41 +00:00
XTra.KrazzY
9d9de41c0a Printf compile warning fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1849 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-11 13:05:43 +00:00
Shawn Hoffman
7ff3d76b0a Update nsis installer and some cleanup. Note: I'm not sure if the installer yet allows for mutliple revisions installed side-by-side, but that is the intention. Also, I need to figure out how to do subsections and some trickies in nsis.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1842 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-09 16:04:28 +00:00
daco65
726fd4baf0 fixed thread.h building and moved the pluginmanager from windows as well
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1841 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-09 13:24:55 +00:00
nakeee
9cae49bb52 moved plugin manager to core.
Can someone fix it on windows? 


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1840 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-09 12:46:04 +00:00
omegadox
5eedc125fa Added an Issues column for saving notes on what problems occur in the game and moved the Notes column to the end, since it doesn't seem to contain any important information.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1833 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-09 09:36:50 +00:00
hrydgard
4916bf54b6 rollback 1829. Seriously, WTF?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1831 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-09 00:09:07 +00:00
tinctorius
e94ba056b6 Removed unused code, removed inclusion of unused headers.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1829 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-08 22:31:02 +00:00
omegadox
9a126190ec Some code cleanup in DolphinWx.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1818 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-07 09:06:42 +00:00
John Peterson
f50746cf0e CodeWindow: Fixed the Unlimited JIT Cache option
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1816 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-07 07:35:12 +00:00
John Peterson
fa27a97fbb Wiimote:
1) I fixed the emulated Nunchuck in Zelda - TP, however I chose the minimum workable delay time that worked in my PC, in fact it's so short that the Nunchuck still fails sometimes. If you have a very fast PC or something like that so that the Nunchuck still don't work please let me know.

2) I also made the Wiimote work after Stop and Start

3) I changed /Dev/USB to initialize the emulated Wiimote directly after ScanEnable, not wait for any countdown

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1814 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-07 02:59:19 +00:00
nakeee
6125efabb1 I don't know why someone decided that a function called wxMsgAlert note the wx in the begining
should be opening win32 window on windows. But few points
- If something is blocked on some debug windows or so please either fix it or post an issue. Don't add ugly hacks.
- Read the function you are changing, there is a default handler, you could should have used it instead or create a new one.
- Please help dolphin look and feel as similar as possible to prevent later issues, so if you add a param please implement it on other
cases or at least add a TODO if you must



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1813 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-06 21:35:39 +00:00
John Peterson
b6f4c4e958 MusicMod: Simplified the initial console log
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1792 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-05 07:02:24 +00:00
facugaich
d6ad009d7a - Bugfix: Don't allow for repeated paths in ISOfolder
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1790 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-05 05:09:23 +00:00
John Peterson
b5ee01ea60 MusicMod: Stop function
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1787 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-05 04:08:18 +00:00
John Peterson
6c57f63280 CodeWindow: Made boot to pause optional, readded the tooltips in the Release build
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1784 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-05 02:52:55 +00:00
John Peterson
442f47df4c DolphinWX: Non-Windows build fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1780 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 23:24:13 +00:00
Shawn Hoffman
b2e96e1ca5 separate SI to be more like EXI, this will be helpful to keep each device in it's own file(s), and fix some menu text. SI devices which are interesting (to me) are GC keyboard, GBA, and N64 devices. Possibly SI.cpp can have the channel part separated out like EXI? Just committing like this to see if this is ok.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1776 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 22:55:55 +00:00
John Peterson
42bcdc4292 Build Settings: The intended commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1775 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 22:44:54 +00:00
John Peterson
fe4fc22127 Build Settings: Reenabled the build events
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1773 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 22:36:58 +00:00
John Peterson
ee82a3ec28 DolphinWX: Build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1772 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 22:14:34 +00:00
John Peterson
eb2ce16a6c Interface and general: Fixed the hangings and crashes that would occur from repeated Start and Stop, added optional toolbar themes, made the fullscreen mode in the OpenGL plugin more user friendly for Windows users
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1770 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 21:53:41 +00:00
Shawn Hoffman
1ed27a4fc1 merge the general and core configmain pages into "main" page, now it doesn't open onto a totally useless page ;)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1769 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 21:29:23 +00:00
nakeee
90560511c9 moving around some event handler code
creating inputcommon


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1766 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-04 19:54:56 +00:00
facugaich
09b3d2d227 Changed the way the iterator is used in PatchAddEdit, I thought I'd submit it since it makes for shorter code.
Also a couple of bugfixes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1755 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-03 23:02:13 +00:00
nakeee
22753f9e3c compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1754 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-03 22:21:34 +00:00
Shawn Hoffman
161d7f369a complete patchaddedit. thanks facugaich
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1753 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-03 21:55:49 +00:00
John Peterson
677c94414b MusicMod: Build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1752 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-03 19:39:17 +00:00
Shawn Hoffman
cea5259d30 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1751 8ced0084-cf51-0410-be5f-012b33b47a6e 2009-01-03 19:31:27 +00:00
Shawn Hoffman
f0cffe4e98 debug build crash fix, re-enable copying of files on building in vs....why was this disabled?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1750 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-03 19:30:59 +00:00
XTra.KrazzY
1db46b6b33 Removed "Invalid ISO File" notification (we seem to get negative feedback about it :| )
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1746 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-03 15:10:03 +00:00
John Peterson
2d25d7dfdc MusicMod: Forgot a file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1737 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-03 01:42:49 +00:00
John Peterson
264056972d MusicMod: Added music modification, it currently only works in Windows
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1736 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-03 01:38:44 +00:00
John Peterson
5e5e507121 nJoy: Enabled keyboard input (only for buttons so far) through wxWidgets in the main application. It only works when you render to the main window.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1706 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 18:50:24 +00:00
hrydgard
dcc48d6c41 just a bunch of random code cleanup i did on the train bored, plus a d3d implementation of NativeVertexFormat which isn't actually used yet.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1658 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-25 15:56:36 +00:00
omegadox
bce493cf3d 1) Added a "General" tab to config window 2) Moved Interface settings to General tab 3) some code organization
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1652 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-25 07:28:41 +00:00
nakeee
8321656a53 Please use alerts instead of wxmessage
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1637 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 11:36:39 +00:00
John Peterson
0f2f17f0b2 Interface settings: Save setting
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1636 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 11:24:11 +00:00
John Peterson
ed156f3eeb Interface settings: Added confirm on stop option
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1635 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 11:11:02 +00:00
John Peterson
8cc09ef74d Change disc: Warn the user if he's changing the disc to a completely different game
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1634 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 09:33:02 +00:00
Sonicadvance1
2852d1b84f Allow use of Logger window without entire debug suite via the -l command line option, make the options actually viewable in the logger and a very little bit of a cleanup in nJoy Test
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1633 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 08:49:52 +00:00
John Peterson
62fff80925 Change disc: Moved some code around, no change in functionality
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1632 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 08:47:37 +00:00
omegadox
5464f2274a Added a DVD menu to main frame and small code move.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1631 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 08:24:30 +00:00
nakeee
73a1b9b2e8 small compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1629 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 07:34:23 +00:00
LPFaint99
b56f7a4682 Added swapdisc function, tested with TOS switching from disc 2 to disc 1. minor memcard manager cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1628 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 07:20:22 +00:00
omegadox
5510c207e6 Added feature "Toggle DVD cover is open", it seems to work but the video message for "Insert Disc" will not show for some reason, so instead the video freezes. Next, the code to let you change the disc needs to be added.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1627 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 06:00:43 +00:00
omegadox
099bd0f4da Added some ground work for a Swap Disc feature (disabled) and commented out a case for Cover Register in DVD write32 - seems pointless to have.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1626 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-23 04:35:21 +00:00
nakeee
422437824c compile fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1613 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-20 19:40:20 +00:00
facugaich
3be88bb2dd - Janitorial tasks
- Bugfix in ARCode/Patch editor


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1612 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-20 18:46:49 +00:00
LPFaint99
011f857b24 Fix for r1600 missing parenthesis, which made it impossible to use an existing memcard
Added set as default to rightclick menu of memcard manager
compile fix for Jit64/Jit.cpp

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1610 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-20 18:43:52 +00:00
LPFaint99
c652c5e1f0 a few more changes, you can now set a default memcard to load, error messages made a bit more clear
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1601 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-20 08:47:38 +00:00
LPFaint99
c695ebd6f1 simplified EXI_DeviceMemoryCard.cpp,
warning fix for WII_IPC_HLE_Device_usb.cpp,
codecleanup and added the ability to create a formated
16Mb memcard in MemcardManager,
calibrate button is now easier to read in nJoy Testing

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1600 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-20 08:07:04 +00:00
nakeee
54c6a624ea fail array was too small
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1590 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-18 23:38:07 +00:00
nakeee
e6424f750b scons changes
added fastlog flavour with LOGGING and -O3
changed debug to include _DEBUG
changed devel to include DEBUGFAST
for now wxonassert is disabled as I couldn't make it work


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1571 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-18 00:37:24 +00:00
nakeee
2a2a83b7c8 small clean up
enabled njoy_test


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1563 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-17 10:30:44 +00:00
magumagu9
ea2045e536 A couple of compile fixes; standard string screwups.
I'm also running into an error in Source/Core/Core/Src/MemTools.cpp, but 
I'm not sure what the right fix is there.



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1562 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-17 09:46:32 +00:00
Shawn Hoffman
4a5d9ded94 namespace-ified ActionReplay, and made ISOProperties use the existing AR code. bonus: encrypted arcodes are saved as unencrypted codes just by closing the isoproperties dialog. also added ARCodeAddEdit, but once again, it only views entries atm. some misc wxw cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1560 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-17 04:14:24 +00:00
hrydgard
3de4df29a3 merge cmp/branch when possible. smaller than expected (nearly unnoticable) speedup :P slightly bigger if you enable line 291 in ppcanalyst.cpp, but that's not fully tested yet.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1551 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-15 22:57:11 +00:00
nakeee
b0f17043bd new MsgHandler replacing common
Most things moved to macros



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1542 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-14 22:00:18 +00:00
hrydgard
64a74c2ba4 Only initialize the Wiimote plugin if booting in Wii mode.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1535 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-14 20:01:01 +00:00
hrydgard
bddc78383e Fullscreen option temporarily removed from Linux build since it doesn't actually work.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1533 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-14 17:37:59 +00:00
nakeee
03088eee2f returned WXpanicalert
it should be extended to get a message
and the code in common.cpp cleaned up


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1529 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-14 12:30:37 +00:00
nakeee
2c66b9d36f wxgl fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1524 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-13 22:40:10 +00:00
nakeee
3c2a41c290 linux compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1522 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-13 19:49:19 +00:00
hrydgard
522752c77d small speedup of logmanager, minor logging improvements, misc code standard improvements, replace a crash with an error message in ppcanalyst
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1521 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-13 16:58:06 +00:00
LPFaint99
d1712f15ca MemcardManager and GCMemcard fixes/code cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1518 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-13 11:30:00 +00:00
LPFaint99
984a3ad699 Disable ETH device so that games that use it do not crash, mariokart GC should boot now. thanks to Chilango for testing the fix. Also rearange functions in GCMemcard to a more logical order
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1517 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-13 07:07:52 +00:00
nakeee
13acef8793 compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1509 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-12 10:42:18 +00:00
omegadox
2c9f66e3b2 some fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1508 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-12 10:33:02 +00:00
omegadox
45201abb9e PanicAlert, PanicYesNo, AskYesNo now use wxMessageBox. Also some very minor fixes in Fill'N'Slide.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1506 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-12 08:47:13 +00:00