Commit Graph

799 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 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
MELERIX 2878f53b75 Sync English.pj.Lang <==> Language Class.cpp 2015-03-28 21:57:02 -03:00
zilmar 84b9bbaf50 Clean up some brackets 2015-03-29 06:54:38 +11:00
Ryan Collins f8fd57d52e Merge https://github.com/project64/project64 into More_Allman 2015-03-26 15:40:16 -04:00
MELERIX dfbf29a035 Cleanup
Removed two duplicated variables in Game Settings.cpp
2015-03-26 02:28:05 -03:00
zilmar 7f44b12673 Merge pull request #327 from toehead2001/master
Remove the extra border around the ROM browser
2015-03-26 16:06:27 +11:00
toehead2001 17da1dbd38 Remove the extra border around the ROM browser 2015-03-25 22:38:59 -06:00
unknown 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
unknown ae80595d47 fix a couple things I forgot to do/overlooked in the past commits 2015-03-26 00:11:43 -04:00
unknown 1fb3921402 Think of "32-bit engines", not "32 bit engines", which is ambiguous. 2015-03-25 23:31:28 -04:00
unknown 2220426a04 "Use High-Level Emulation Audio" doesn't make a lot of sense. 2015-03-25 23:29:02 -04:00
unknown e947bbc175 (It also believes in hyphens.) 2015-03-25 23:25:58 -04:00
unknown 5e17306b3e Conventional English writing avoids expressing (int < 100) as decimals. 2015-03-25 23:25:23 -04:00
unknown 401ff21d61 A complete English sentence always has a subject and a verb.
It also always ends with punctuation of some form, like a period.
2015-03-25 23:21:42 -04:00
unknown e38e6e6be4 In most cases, bytes aren't swapping images. Images get byte-swapped. 2015-03-25 23:18:31 -04:00
unknown 161ac36f6a seems I missed a few cases of unnecessary casing :( 2015-03-25 23:16:26 -04:00
unknown 0402a600a0 used in a complete sentence: "Sally gave me a short cut."
Did she give me a detour kind of "short cut", or did she just cut off my balls?
If we prefer not to say "shortcut", then at least say "short-cut".  This way, the adjective "short" is co-joined with "cut" to indicate that they are connected.  This guarantees that the "cut" is associated with "short", and not whatever word comes after.
2015-03-25 23:13:09 -04:00
unknown 64c8a7ad6e Event phrases are not titles or advertisement brand names. 2015-03-25 23:08:42 -04:00
unknown 62d1d7e97f Percentage of **what** speed? Full NTSC/PAL speed? Real hardware limit? 2015-03-25 23:07:25 -04:00
unknown 80f9254669 used in a complete sentence: "I have a 4kbit penis." 2015-03-25 23:05:48 -04:00
unknown f04744d65f stop that. 2015-03-25 22:59:31 -04:00
unknown 0721db93bb "Directories" is not a proper noun. Just "dir" is fine, not "Dir". 2015-03-25 22:43:47 -04:00
unknown 462f1c6f53 "Frame rate" is too specific, as that means RDP drawing/buffer rate. 2015-03-25 22:41:44 -04:00
unknown fae0c71a96 A drop-down menu is to the right of this, so a colon would be nice.
If you don't have a colon between the "Frame Rate Display" and the combo box, then it just looks like the combox box is randomly placed there and unrelated to the checkbox you just checked/unchecked.
2015-03-25 22:40:22 -04:00
unknown b331f9f452 So far, checkbox options seem to not use title case, just menu options. 2015-03-25 22:33:39 -04:00
unknown 17229ea735 "Screen saver" is not a proper noun. (Neither is "screensaver".) 2015-03-25 22:32:07 -04:00
unknown d4b654379c Again, title case capitalization rules apply not to subtle phrases. 2015-03-25 22:29:05 -04:00
unknown f2b69d1c2f http://dictionary.reference.com/browse/fullscreen
If "fullscreen" was a valid word, it would be an adjective, not a noun.  You cannot "go to" an adjective because adjectives are not places, people or things.  So it should be "enter" as in "enter a mode" (such as a full-screen mode), not "go to".
2015-03-25 22:26:09 -04:00
unknown f02bae81db not a complete sentence so shouldn't need a period at the end 2015-03-25 22:19:56 -04:00
unknown eeded3a1bf states directory for more than one saved state--should be plural 2015-03-25 22:17:52 -04:00
unknown c9f5697a06 Common nouns such as "directory" do not get capitalized. 2015-03-25 22:13:05 -04:00
unknown 02fe744168 "Reality" is a proper noun...I suppose "Reality Signal Processor" also is. 2015-03-25 22:10:21 -04:00
unknown 61674ad5d4 "Use High Level Emulation Audio" does not make sense.
"Use high-level-emulated audio" does make sense, but seems a tad bit strong (and people could mistake the "high level" to mean extra/better emulation without any scientific HLE understanding).  So I think "Audio HLE" looks better.
2015-03-25 22:06:24 -04:00
unknown 893156c61d no reason to capitalize "directory" at end of incomplete sentence 2015-03-25 21:56:00 -04:00
unknown 80d1aa8edd pretty sure title case capitalization doesn't apply to discrete phrases 2015-03-25 21:53:05 -04:00
unknown ceea0e47ff drop '%'
Either say "Percentage", or just drop the '%' since this symbol of unit is not relevant to what the menu item should convey to the user.  What we're really trying to do is show the CPU usage statistics...most likely the users would see for themselves what unit it comes out as (percentage, fraction, whatever).
2015-03-25 21:50:37 -04:00
unknown 3394211447 "Usage", as a noun, is always capitalized in title case. 2015-03-25 21:47:30 -04:00
unknown 3a1ab654ca Do not capitalize "on".
"On" is a preposition shorter than 5 letters long.  Standard title case does not ever capitalize short prepositions (unless they are the very first word of the title, then usually).  You can see this logic in the Visual Studio 2008 IDE itself:  It has menu items such as "Attach to Process" and "Find[/Replace] in Files", in which the prepositions "to" and "in" are, correctly so, not capitalized by Microsoft in the VS2008 menus.
2015-03-25 21:46:35 -04:00
unknown 70bf6b1ad9 if using title case for INI section names, then capitalize "file" 2015-03-25 21:33:21 -04:00
zilmar 0ef84b7400 Merge pull request #322 from toehead2001/master
English language fixes - Upper case "ROM", consistent terminology for saved States, spelling
2015-03-26 11:17:58 +11:00
Ryan Collins 1d26ffc661 re-add parenthesis from last commit 2015-03-25 19:34:39 -04:00
Ryan Collins 1c044867ae Update the N64 System/Debugger files to allman 2015-03-25 18:26:02 -04:00
toehead2001 521857a643 Casing consistancy of "ROM" Make "State" the noun for saved states. Misc. spelling and abbreviation casing fixes 2015-03-25 15:48:23 -06:00
Ryan Collins 117c1ef3fc Remove whitespace added in previous commit 2015-03-25 17:15:25 -04:00
Ryan Collins 6a47fcd485 Update N64 System/C Core to allman 2015-03-25 17:12:40 -04:00
zilmar 061fbefa62 [PJ64 NRage] ignore raw when mempak is enabled 2015-03-26 07:54:48 +11:00
Ryan Collins b6181d5fe5 Add white space in multilanguage files 2015-03-25 16:52:34 -04:00
zilmar b3aaef221c [PJ64 NRage] Change default for mempack in the default config file 2015-03-26 07:46:44 +11:00
Ryan Collins 90b84ab632 Re-add missing braces from previous commit 2015-03-25 16:38:32 -04:00
Ryan Collins e6f834f11b Convert multilanguage files to allman format 2015-03-25 16:34:26 -04:00
zilmar a3e6ad1a80 Merge pull request #304 from toehead2001/master
English translation Clean Up
2015-03-26 07:07:07 +11:00
zilmar 3a9c552450 Merge pull request #305 from cxd4/wow_such_depth_very_buffer_much_frame_professor_zilmar_will_cry
standardize exception-prone x86 behavior to normal C division
2015-03-24 15:10:47 +11:00
zilmar bb5d7a4698 Merge pull request #309 from cxd4/do_et_4_mah_lulz
minor clean-ups to Glide64 config
2015-03-24 11:17:11 +11:00
unknown aede9e2eaf use functions to free cache space & smaller DLL (finished) 2015-03-23 19:38:32 -04:00
unknown 5387b9354d use functions to free cache space & smaller DLL (Data_DWORD_Game) 2015-03-23 18:53:53 -04:00
unknown 2e1dab501c use functions to free cache space & smaller DLL (Data_DWORD_General) 2015-03-23 18:43:41 -04:00
zilmar b3416d727a Merge pull request #308 from MELERIX/updates
minor updates for Installer.iss & package_zip.bat
2015-03-24 09:42:25 +11:00
unknown f48cbd1756 express `stipple_pattern` as 32-bit hex storage rather than decimal 2015-03-23 16:19:00 -04:00
unknown f6966f5e95 no moar lulz :( 2015-03-23 16:11:50 -04:00
MELERIX 1a47671cdb minor updates for Installer.iss & package_zip.bat 2015-03-23 15:28:00 -03:00
AmbientMalice 34d21f2a26 Enable FB and Soft Depth for Glide64.
After some testing, I've concluded that software depth is better on by default than off. Testing every single game would be too time consuming, and the problems it fixes can be obscure. Enabling FB by default just seems like good sense. A few games need it disabled, but I'll fix them case-by-case.
2015-03-23 20:47:52 +10:00
toehead2001 c622f5e788 Use "HLE" and "LLE" exclusively. Changed "ini" to more fitting terms. 2015-03-23 03:00:23 -06:00
unknown f82699c378 standardize exception-prone x86 behavior to normal C division 2015-03-23 01:20:23 -04:00
Samuel Yuan 8e6de534e6 Changed "SP Hack" setting to "Fast SP" 2015-03-22 13:17:42 -04:00
Samuel Yuan 5f9f2937e7 changed sp_hack to fast sp 2015-03-22 13:05:15 -04:00
Samuel Yuan d4fc9b355b merge changes 2015-03-22 12:47:21 -04:00
Samuel Yuan 4324f25394 Removed installer files for outdated language files 2015-03-21 09:16:27 -04:00
MELERIX e707a80abd SP Hack is now Fast SP 2015-03-21 06:47:48 -03:00
Samuel Yuan c7041f7a61 Restored SP_HACK 2015-03-20 22:32:55 -04:00
Samuel Yuan d3e1e1fc89 Added even more updates
Had to remove an unused string and replace it because there wasn't
enough memory
2015-03-20 15:38:55 -04:00
Samuel Yuan f2cacbf045 Updated some more UI strings 2015-03-20 14:36:29 -04:00
Samuel Yuan 07694dff40 Merge remote-tracking branch 'project64/master' 2015-03-20 13:15:57 -04:00
MELERIX f1c9add43a Removed Thumbs.db files 2015-03-20 05:46:56 -03:00
AmbientMalice 36cc34f10d TLB Unmapping and Protect Memory UI fix.
This should work. I think.
2015-03-20 13:36:49 +10:00
zilmar 175f294a00 Merge branch 'master' of https://github.com/project64/project64 2015-03-19 08:03:53 +11:00
zilmar f7750c0dd0 fix issue #275: duplicating Advanced options 2015-03-19 08:03:29 +11:00
zilmar 870c26d7b1 Merge pull request #287 from cxd4/so_i_herd_u_liek_Allman
converted most components to Project64 for Allman-style braces
2015-03-19 07:52:35 +11:00
zilmar 312516567e Only initialize plugins if has been created 2015-03-18 20:49:15 +11:00
zilmar 9cec56fc89 Nrage: default to mem pak 2015-03-18 20:48:45 +11:00
zilmar 8afe84f315 Set ini file to auto flush changes 2015-03-18 20:47:24 +11:00
unknown b890afe78b [RSP] some scope and spacing formatting clean-ups 2015-03-18 00:50:48 -04:00
Samuel Yuan 436a27c40d Fixed a few more UI translations 2015-03-17 22:09:33 -04:00
unknown 86952f5cc6 [Settings] some scope and spacing formatting clean-ups 2015-03-17 18:49:20 -04:00
unknown a247ffe6b1 [PJ64 NRage] some scope and spacing formatting clean-ups 2015-03-17 18:47:32 -04:00
unknown 5158883a86 [PJ64 NRage] minor consistency change in the headers
I'm not really a fan of using the Allman method of braces for typedef's, struct's or other data, but in this case N-Rage seems to have made up his mind throughout 99% the rest of the source to use Allman through it, except only for this particular file.  So I guess better to be consistent with the rest.
2015-03-17 17:26:25 -04:00
unknown ae04d23d86 [Common] some scope and spacing formatting clean-ups
Miserably hated doing this commit.  Couldn't tell which code was whose, which was copyrighted, which was foreign enough to Project64 that I'd probably best just leave-as is, which was even worth considering part of Project64, which cleanups to omit doing and ignore because some ugly practices were rampant throughout the entire file and distracted from the purpose of this pull request too much.  So tried to stick to mostly just the braces/indentation changes here.
2015-03-17 17:19:42 -04:00
zilmar b09fd8296a Merge pull request #272 from Nekokabu/patch-2
Enable "Use System Font"
2015-03-18 07:10:00 +11:00
zilmar 262c8ffe9d lamguage changes for rombrowser 2015-03-17 22:34:47 +11:00
Samuel Yuan 04ce2f6054 Made extra UI strings translateable 2015-03-16 22:56:53 -04:00
Nekokabu c78eb75ccf Enable "Use System Font" 2015-03-14 02:37:32 +09:00
unknown 516df09fce updating FPU locations just if STATUS_FR was changed, not entire reg 2015-03-12 19:53:28 -04:00
zilmar b1d3a27539 Language: Make sure string added to second level of keyboard shortcut added as utf16 2015-03-13 08:39:08 +11:00
zilmar 2a528562bf Fix load perm cheats 2015-03-12 17:58:41 +11:00
unknown a155a74f48 line break consistency fix: TxUtil.cpp 2015-03-11 17:17:43 -04:00