summaryrefslogtreecommitdiffstats
path: root/src/text (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-292-13/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/control/Script.cpp # src/control/ScriptCommands.h # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Pad.cpp # src/core/Pad.h # src/core/config.h # src/entities/Entity.cpp # src/render/Credits.cpp # src/render/Fluff.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Timecycle.cpp # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp # src/text/Text.cpp
| * Merge branch 'master' into ps2menuFire_Head2020-06-292-0/+24
| |\
| | * fixed CText to be 64 bit compatibleaap2020-05-162-0/+24
| | |
| * | restore Text.cppFire-Head2020-06-281-6/+6
| | |
| * | fixesFire-Head2020-06-281-6/+6
| | |
| * | mips overdoseFire-Head2020-06-272-8/+30
| |/
* | VC CMenuManager struct, ctor etc.eray orçunus2020-05-221-2/+2
| |
* | CTextSergeanur2020-05-182-48/+243
| |
* | fixed CText to be 64 bit compatibleaap2020-05-162-0/+24
|/
* Fixed typos and made all assert functions optionalbigbossbro082020-05-101-3/+1
|
* defined out asserts.bigbossbro082020-05-101-0/+3
|
* Fix CMessages::InsertStringInStringSergeanur2020-05-031-1/+1
|
* FixesSergeanur2020-04-272-1135/+1148
|
* Merge branch 'master' into MoreLanguagesSergeanur2020-04-266-76/+19
|\ | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Frontend.cpp # src/core/MenuScreens.h # src/render/Font.cpp # src/render/Font.h # src/text/Messages.cpp # src/text/Text.cpp
| * Initial GLFW supporteray orçunus2020-04-261-3/+0
| |
| * Add polish lang supportFire-Head2020-04-191-0/+3
| |
| * Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-192-3/+3
| |
| * Remove patchesSergeanur2020-04-173-62/+4
| |
| * rem refsFire-Head2020-04-172-4/+4
| |
| * More refs removedSergeanur2020-04-164-8/+8
| |
* | Merge branch 'master' into MoreLanguagesSergeanur2020-04-142-220/+220
|\| | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Frontend.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Hud.h # src/text/Messages.cpp # src/text/Text.cpp
| * normalized line endings to LFaap2020-04-094-1379/+1379
| |
* | JapaneseSergeanur2020-04-052-6/+29
|/
* Add russian lang supportSergeanur2020-03-301-0/+5
|
* Fix Text n PagerSergeanur2020-03-282-285/+285
|
* fix Messages.cppFire_Head2019-10-271-49/+49
|
* Fixing array sizes in CMessagesSergeanur2019-10-251-17/+17
|
* Fix CPager::Process loopSergeanur2019-10-251-0/+1
|
* FixesSergeanur2019-10-213-61/+55
|
* Full MessagesSergeanur2019-10-214-60/+886
|
* Full CPagerSergeanur2019-10-202-0/+223
|
* Move MessagesSergeanur2019-10-202-0/+82
|
* CText encoding fixesSergeanur2019-10-202-0/+378