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
ac2a6d25c3
Merge remote-tracking branch 'PJ64_Upstream/master'
2015-03-26 22:48:23 -04:00
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
1a9496192f
Merge pull request #332 from samuelyuan/master
...
Minor Updates to Language Files
2015-03-27 13:46:36 +11:00
c351e030d8
fix regression from while I was replacing Rom with ROM
2015-03-26 21:18:35 -04:00
d356badd59
Remove other unnecessary files
...
There should only be one file for Traditional Chinese
2015-03-26 21:13:57 -04:00
b92a312154
Merge changes in Swedish file
2015-03-26 20:54:29 -04:00
bf65edadf8
The language "Czech" in Czech should be čeština
2015-03-26 20:52:24 -04:00
31c88f75b7
replicated commit 394144c for English language files
2015-03-26 20:30:44 -04:00
bcb1e801c9
replicated commit 1fb3921 for English language files
2015-03-26 20:29:26 -04:00
95163000be
replicated commit 2220426 for English language files
2015-03-26 20:27:13 -04:00
7d5c00947c
replicated commits 5e17306 and e947bbc for English language files
2015-03-26 20:24:40 -04:00
6b500a7524
replicated commit 401ff21 for English language files
2015-03-26 20:23:28 -04:00
dadf921609
replicated commit e38e6e6 for English language files
2015-03-26 20:16:14 -04:00
682f39c373
replicated commit 161ac36 for English language files
2015-03-26 20:15:29 -04:00
5d3d2fd065
replicate commit 0402a60 for language files
2015-03-26 20:06:29 -04:00
075dffd76a
replicated commit 64c8a7a for English language files
2015-03-26 19:59:41 -04:00
508ad683a0
replicated commit 62d1d7e for English language files
2015-03-26 19:58:18 -04:00
23ae2b76be
"Nintendo64" is not a valid word. "Nintendo 64" is the proper noun.
2015-03-26 19:56:07 -04:00
201b4f3bfe
seem to have somehow missed a few surviving instances of "Rom"
2015-03-26 19:50:51 -04:00
08f30942f0
replicated commit 80f9254 for language files
2015-03-26 19:45:55 -04:00
c2a2d73956
replicated commit 462f1c6 for English language files
2015-03-26 19:09:10 -04:00
502dad418a
replicated commit fae0c71 for language files
2015-03-26 19:02:19 -04:00
82a83cd730
replicated commit b331f9f for English language files
2015-03-26 18:53:50 -04:00
7f8737cf81
replicated commit f2b69d1 for English language files
2015-03-26 18:52:04 -04:00
ecb9c7590f
replicated commit f02bae8 for English language files
2015-03-26 18:45:55 -04:00
3eb82ebb9c
replicated commit eeded3a for English language files
2015-03-26 18:45:04 -04:00
9b1d086ed7
backported hopefully all of my frustrations from commit f04744d
2015-03-26 18:32:31 -04:00
a6646b6c30
replicated commit 02fe744 for language files
2015-03-26 17:21:33 -04:00
cc5d36712c
replicated commit 61674ad for English language files
2015-03-26 17:14:13 -04:00
9e89332a53
replicated commit 893156c for language files
2015-03-26 17:10:35 -04:00
3780fc8479
Stop saying "Rom". It's an acronym, not a word.
2015-03-26 17:01:26 -04:00
703b47da36
replicated commit 80d1aa8 for language files
2015-03-26 15:44:58 -04:00
f8fd57d52e
Merge https://github.com/project64/project64 into More_Allman
2015-03-26 15:40:16 -04:00
dc49a8dab7
replicated commit ceea0e4 for English language files
2015-03-26 15:23:02 -04:00
e53e4272c8
replicated commit 3394211 for language files (well, some of them...)
2015-03-26 15:21:26 -04:00
bc21617a55
replicated commit 3a1ab65 for language files
...
Seems Smiff's "English (alternative)" translation already had the right idea and did not need this change.
2015-03-26 15:14:26 -04:00
d5bb539fcb
matched all language files to Git end-of-file line break convention
2015-03-26 15:12:29 -04:00
af29a0af96
replicated commit 70bf6b1 for language files
2015-03-26 15:04:18 -04:00
2bea10d721
Merge pull request #328 from MELERIX/cleanup
...
Cleanup
2015-03-26 16:40:49 +11:00
dfbf29a035
Cleanup
...
Removed two duplicated variables in Game Settings.cpp
2015-03-26 02:28:05 -03:00
7f44b12673
Merge pull request #327 from toehead2001/master
...
Remove the extra border around the ROM browser
2015-03-26 16:06:27 +11:00
17da1dbd38
Remove the extra border around the ROM browser
2015-03-25 22:38:59 -06:00
f447fccc2d
Merge pull request #326 from cxd4/lrn2engrish
...
Grammatical fixes to Project64 language class (English).
2015-03-26 15:30:22 +11:00
394144cf91
A comma should not precede a conjunction in a compound sentence.
...
... unless it is the joint between the main clause and subordinate clause of said compound sentence
2015-03-26 00:12:49 -04:00
ae80595d47
fix a couple things I forgot to do/overlooked in the past commits
2015-03-26 00:11:43 -04:00
1fb3921402
Think of "32-bit engines", not "32 bit engines", which is ambiguous.
2015-03-25 23:31:28 -04:00
2220426a04
"Use High-Level Emulation Audio" doesn't make a lot of sense.
2015-03-25 23:29:02 -04:00
e947bbc175
(It also believes in hyphens.)
2015-03-25 23:25:58 -04:00
5e17306b3e
Conventional English writing avoids expressing (int < 100) as decimals.
2015-03-25 23:25:23 -04:00
unknown