Commit Graph

1896 Commits

Author SHA1 Message Date
Ryan Collins 2a3d1c09ff Merge https://github.com/project64/project64 into More_Allman 2015-03-29 10:04:06 -04:00
zilmar 6bd7f7ccab [Glide64] 2.0.0.5 2015-03-29 18:56:18 +11:00
zilmar 2ac6422b22 [rdb] 2.2.4 2015-03-29 18:55:10 +11:00
zilmar 06f218a4c3 [Project 64] 2.2.0.3 2015-03-29 18:54:04 +11:00
zilmar 9380221dc2 [PJ64 NRage] 2.4.0.4 2015-03-29 18:52:19 +11:00
toehead2001 5fd7f61e97 Cheats window - Remove extra border, Update checkmark gfx 2015-03-29 01:23:58 -06:00
zilmar 11bb35f024 [RSP] 1.7.0.13 2015-03-29 17:38:30 +11:00
zilmar 73620c8519 Merge branch 'master' of https://github.com/project64/project64 2015-03-29 17:35:53 +11:00
zilmar 2bcf9c806f Merge pull request #338 from MELERIX/patch
Sync English.pj.Lang <==> Language Class.cpp
2015-03-29 17:34:05 +11:00
zilmar 83edebcae2 Merge pull request #339 from MELERIX/cleanup
Cleanup extra white spaces
2015-03-29 17:32:46 +11:00
MELERIX 72f534a95b Cleanup 2015-03-28 22:37:09 -03:00
MELERIX 2878f53b75 Sync English.pj.Lang <==> Language Class.cpp 2015-03-28 21:57:02 -03:00
zilmar 6d04352563 Merge pull request #337 from Lithium64/Patch-1
Updated Brazilian language file and support files
2015-03-29 07:06:15 +11:00
zilmar 84b9bbaf50 Clean up some brackets 2015-03-29 06:54:38 +11:00
Lithium64 c39a914c28 Changed all support files to UTF-8 BOM 2015-03-28 15:48:43 -03:00
Lithium64 2d40591282 Updated RDB date 2015-03-28 15:35:14 -03:00
Lithium64 47edeaf71a Alphabetical order fix
Alphabetical Order

The English alphabet starts with the letter a and finishes with the
letter z. We always write the alphabet in the same order:

a-b-c-d-e-f-g-h-i-j-k-l-m-n-o-p-q-r-s-t-u-v-w-x-y-z

A-B-C-D-E-F-G-H-I-J-K-L-M-N-O-P-Q-R-S-T-U-V-W-X-Y-Z

This order is called "alphabetical order". We often write lists in
alphabetical order. For example, to write a list of countries in
alphabetical order, we start with countries that begin with the letter
A, then with countries that begin with B, and so on. For example:

Australia
Brazil
Canada
2015-03-28 15:31:51 -03:00
Lithium64 73423a2479 Updated Brazilian Language File 2015-03-28 15:19:53 -03:00
zilmar 782fe6e6f6 Merge pull request #333 from MelchiorGaspar/master
rdb update, set Sync Audio=0, Aidyn Chronicles - The First Mage
2015-03-29 03:00:18 +11:00
MelchiorGaspar 7ea424a217 Merge remote-tracking branch 'PJ64_Upstream/master' 2015-03-27 16:53:26 -04:00
zilmar 34d4d73745 Merge pull request #331 from cxd4/I_hate_naming_these_stupid_branches
attempting to synchronize [most?] language class changes to language files
2015-03-28 07:39:42 +11:00
unknown 18fcf4ad6f Merge branch 'master' into I_hate_naming_these_stupid_branches
Conflicts:
	Lang/Chinese (Taiwan).pj.Lang
	Lang/Swedish.pj.Lang
	Lang/T-Chinese.pj.Lang
2015-03-27 13:02:36 -04:00
MelchiorGaspar ac2a6d25c3 Merge remote-tracking branch 'PJ64_Upstream/master' 2015-03-26 22:48:23 -04:00
MelchiorGaspar 55b02c54ec "AmbientMalice comment on Pull Request #319
The game currently has FAT and Audio Sync both enabled, which IMO is a bad idea because it makes the game's framerate erratic."

I tried it with
Sync Audio=0
and i didn't notice anything bad...

Sync Audio, enabled or disabled I didn't see an difference in frame rate on my PC....
2015-03-26 22:47:11 -04:00
zilmar 1a9496192f Merge pull request #332 from samuelyuan/master
Minor Updates to Language Files
2015-03-27 13:46:36 +11:00
unknown c351e030d8 fix regression from while I was replacing Rom with ROM 2015-03-26 21:18:35 -04:00
Samuel Yuan d356badd59 Remove other unnecessary files
There should only be one file for Traditional Chinese
2015-03-26 21:13:57 -04:00
Samuel Yuan b92a312154 Merge changes in Swedish file 2015-03-26 20:54:29 -04:00
Samuel Yuan bf65edadf8 The language "Czech" in Czech should be čeština 2015-03-26 20:52:24 -04:00
unknown 31c88f75b7 replicated commit 394144c for English language files 2015-03-26 20:30:44 -04:00
unknown bcb1e801c9 replicated commit 1fb3921 for English language files 2015-03-26 20:29:26 -04:00
unknown 95163000be replicated commit 2220426 for English language files 2015-03-26 20:27:13 -04:00
unknown 7d5c00947c replicated commits 5e17306 and e947bbc for English language files 2015-03-26 20:24:40 -04:00
unknown 6b500a7524 replicated commit 401ff21 for English language files 2015-03-26 20:23:28 -04:00
unknown dadf921609 replicated commit e38e6e6 for English language files 2015-03-26 20:16:14 -04:00
unknown 682f39c373 replicated commit 161ac36 for English language files 2015-03-26 20:15:29 -04:00
unknown 5d3d2fd065 replicate commit 0402a60 for language files 2015-03-26 20:06:29 -04:00
unknown 075dffd76a replicated commit 64c8a7a for English language files 2015-03-26 19:59:41 -04:00
unknown 508ad683a0 replicated commit 62d1d7e for English language files 2015-03-26 19:58:18 -04:00
unknown 23ae2b76be "Nintendo64" is not a valid word. "Nintendo 64" is the proper noun. 2015-03-26 19:56:07 -04:00
unknown 201b4f3bfe seem to have somehow missed a few surviving instances of "Rom" 2015-03-26 19:50:51 -04:00
unknown 08f30942f0 replicated commit 80f9254 for language files 2015-03-26 19:45:55 -04:00
unknown c2a2d73956 replicated commit 462f1c6 for English language files 2015-03-26 19:09:10 -04:00
unknown 502dad418a replicated commit fae0c71 for language files 2015-03-26 19:02:19 -04:00
unknown 82a83cd730 replicated commit b331f9f for English language files 2015-03-26 18:53:50 -04:00
unknown 7f8737cf81 replicated commit f2b69d1 for English language files 2015-03-26 18:52:04 -04:00
unknown ecb9c7590f replicated commit f02bae8 for English language files 2015-03-26 18:45:55 -04:00
unknown 3eb82ebb9c replicated commit eeded3a for English language files 2015-03-26 18:45:04 -04:00
unknown 9b1d086ed7 backported hopefully all of my frustrations from commit f04744d 2015-03-26 18:32:31 -04:00
unknown a6646b6c30 replicated commit 02fe744 for language files 2015-03-26 17:21:33 -04:00