ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'project64/master'

This commit is contained in:
Samuel Yuan 2015-04-11 11:38:22 -04:00
parent 00427ff0e9 b6e2cece00
commit 31cd0c6d98
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config/Project64.rdb
View File

@ -684,6 +684,7 @@ Plugin Note=[video] depth problem (use Glide64 RDRAM Size=8 in main RDB, otherwi
AiCountPerBytes=530 AiCountPerBytes=530
Counter Factor=1 Counter Factor=1
Fixed Audio=1 Fixed Audio=1
Linking=Off
Sync Audio=0 Sync Audio=0
[7C64E6DB-55B924DB-C:50] [7C64E6DB-55B924DB-C:50]
@ -4744,6 +4745,7 @@ Plugin Note=[video] slow in options menu
RDRAM Size=8 RDRAM Size=8
ViRefresh=1500 ViRefresh=1500
AiCountPerBytes=530 AiCountPerBytes=530
Counter Factor=1
Fixed Audio=1 Fixed Audio=1
Sync Audio=0 Sync Audio=0
@ -4755,6 +4757,7 @@ Plugin Note=[video] slow in options menu
RDRAM Size=8 RDRAM Size=8
ViRefresh=1500 ViRefresh=1500
AiCountPerBytes=530 AiCountPerBytes=530
Counter Factor=1
Fixed Audio=1 Fixed Audio=1
Sync Audio=0 Sync Audio=0
@ -4785,6 +4788,7 @@ Plugin Note=[video] depth problem (use Glide64 and RDRAM Size=4 in main RDB, oth
AiCountPerBytes=530 AiCountPerBytes=530
Counter Factor=1 Counter Factor=1
Fixed Audio=1 Fixed Audio=1
Linking=Off
Sync Audio=0 Sync Audio=0
[2F493DD0-2E64DFD9-C:45] [2F493DD0-2E64DFD9-C:45]
@ -4798,6 +4802,7 @@ AiCountPerBytes=530
Counter Factor=1 Counter Factor=1
Culling=1 Culling=1
Fixed Audio=1 Fixed Audio=1
Linking=Off
Sync Audio=0 Sync Audio=0
[AA18B1A5-07DB6AEB-C:45] [AA18B1A5-07DB6AEB-C:45]
@ -4811,6 +4816,7 @@ AiCountPerBytes=530
Counter Factor=1 Counter Factor=1
Culling=1 Culling=1
Fixed Audio=1 Fixed Audio=1
Linking=Off
Sync Audio=0 Sync Audio=0
[02D8366A-6CABEF9C-C:50] [02D8366A-6CABEF9C-C:50]

4
Lang/English.pj.Lang
View File

@ -254,7 +254,7 @@
#502# "CPU core style:" #502# "CPU core style:"
#503# "Self mod methods" #503# "Self mod methods"
#504# "Default memory size:" #504# "Default memory size:"
#505# "Advanced block linking:" #505# "Advanced block linking"
#506# "Start emulation when ROM is opened" #506# "Start emulation when ROM is opened"
#507# "Always override default settings with ones from RDB" #507# "Always override default settings with ones from RDB"
#508# "Automatically compress saved states" #508# "Automatically compress saved states"
@ -269,7 +269,7 @@
#520# "CPU core style:" #520# "CPU core style:"
#521# "VI refresh rate:" #521# "VI refresh rate:"
#522# "Memory size:" #522# "Memory size:"
#523# "Advanced block linking:" #523# "Advanced block linking"
#524# "Default save type:" #524# "Default save type:"
#525# "Counter factor:" #525# "Counter factor:"
#526# "Larger compile buffer" #526# "Larger compile buffer"

4
Lang/Spanish.pj.Lang
View File

@ -254,7 +254,7 @@
#502# "Estilo de núcleo del CPU:" #502# "Estilo de núcleo del CPU:"
#503# "Métodos self mod:" #503# "Métodos self mod:"
#504# "Tamaño de memoria predeterminado:" #504# "Tamaño de memoria predeterminado:"
#505# "Vinculación avanzada de bloques:" #505# "Vinculación avanzada de bloques"
#506# "Iniciar emulación cuando el ROM sea abierto" #506# "Iniciar emulación cuando el ROM sea abierto"
#507# "Siempre sustituir los ajustes predeterminados con los de la RDB" #507# "Siempre sustituir los ajustes predeterminados con los de la RDB"
#508# "Comprimir automáticamente estados guardados" #508# "Comprimir automáticamente estados guardados"
@ -269,7 +269,7 @@
#520# "Estilo de núcleo del CPU:" #520# "Estilo de núcleo del CPU:"
#521# "Frecuencia de actualización de VI:" #521# "Frecuencia de actualización de VI:"
#522# "Tamaño de memoria:" #522# "Tamaño de memoria:"
#523# "Vinculación avanzada de bloques:" #523# "Vinculación avanzada de bloques"
#524# "Tipo de guardado predeterminado:" #524# "Tipo de guardado predeterminado:"
#525# "Factor de contador:" #525# "Factor de contador:"
#526# "Buffer de compilación ampliado" #526# "Buffer de compilación ampliado"

4
Source/Project64/Multilanguage/Language Class.cpp
View File

@ -249,7 +249,7 @@ void CLanguage::LoadDefaultStrings (void)
DEF_STR(ADVANCE_CPU_STYLE, L"CPU core style:"); DEF_STR(ADVANCE_CPU_STYLE, L"CPU core style:");
DEF_STR(ADVANCE_SMCM, L"Self-mod methods:"); DEF_STR(ADVANCE_SMCM, L"Self-mod methods:");
DEF_STR(ADVANCE_MEM_SIZE, L"Default memory size:"); DEF_STR(ADVANCE_MEM_SIZE, L"Default memory size:");
DEF_STR(ADVANCE_ABL, L"Advanced block linking:"); DEF_STR(ADVANCE_ABL, L"Advanced block linking");
DEF_STR(ADVANCE_AUTO_START, L"Start emulation when ROM is opened"); DEF_STR(ADVANCE_AUTO_START, L"Start emulation when ROM is opened");
DEF_STR(ADVANCE_OVERWRITE, L"Always override default settings with ones from RDB"); DEF_STR(ADVANCE_OVERWRITE, L"Always override default settings with ones from RDB");
DEF_STR(ADVANCE_COMPRESS, L"Automatically compress saved states"); DEF_STR(ADVANCE_COMPRESS, L"Automatically compress saved states");
@ -264,7 +264,7 @@ void CLanguage::LoadDefaultStrings (void)
DEF_STR(ROM_CPU_STYLE, L"CPU core style:"); DEF_STR(ROM_CPU_STYLE, L"CPU core style:");
DEF_STR(ROM_VIREFRESH, L"VI refresh rate:"); DEF_STR(ROM_VIREFRESH, L"VI refresh rate:");
DEF_STR(ROM_MEM_SIZE, L"Memory size:"); DEF_STR(ROM_MEM_SIZE, L"Memory size:");
DEF_STR(ROM_ABL, L"Advanced block linking:"); DEF_STR(ROM_ABL, L"Advanced block linking");
DEF_STR(ROM_SAVE_TYPE, L"Default save type:"); DEF_STR(ROM_SAVE_TYPE, L"Default save type:");
DEF_STR(ROM_COUNTER_FACTOR, L"Counter factor:"); DEF_STR(ROM_COUNTER_FACTOR, L"Counter factor:");
DEF_STR(ROM_LARGE_BUFFER, L"Larger compile buffer"); DEF_STR(ROM_LARGE_BUFFER, L"Larger compile buffer");