summaryrefslogtreecommitdiffstats
path: root/src/text/Text.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-13/+33
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-291-0/+16
| |\
| | * fixed CText to be 64 bit compatibleaap2020-05-161-0/+16
| | |
| * | restore Text.cppFire-Head2020-06-281-6/+6
| | |
| * | fixesFire-Head2020-06-281-6/+6
| | |
| * | mips overdoseFire-Head2020-06-271-8/+28
| |/
* | VC CMenuManager struct, ctor etc.eray orçunus2020-05-221-2/+2
| |
* | CTextSergeanur2020-05-181-44/+206
| |
* | fixed CText to be 64 bit compatibleaap2020-05-161-0/+16
|/
* FixesSergeanur2020-04-271-317/+319
|
* Merge branch 'master' into MoreLanguagesSergeanur2020-04-261-20/+6
|\ | | | | | | | | | | | | | | | | | | # 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
| * Add polish lang supportFire-Head2020-04-191-0/+3
| |
| * Remove patchesSergeanur2020-04-171-19/+1
| |
| * rem refsFire-Head2020-04-171-1/+1
| |
| * More refs removedSergeanur2020-04-161-1/+1
| |
| * normalized line endings to LFaap2020-04-091-324/+324
| |
* | JapaneseSergeanur2020-04-051-1/+8
|/
* Add russian lang supportSergeanur2020-03-301-0/+5
|
* Fix Text n PagerSergeanur2020-03-281-271/+271
|
* CText encoding fixesSergeanur2019-10-201-0/+319