summaryrefslogtreecommitdiffstats
path: root/src/text/Text.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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/+8
| |\
| | * fixed CText to be 64 bit compatibleaap2020-05-161-0/+8
| | |
| * | mips overdoseFire-Head2020-06-271-0/+2
| |/
* | CTextSergeanur2020-05-181-4/+37
| |
* | fixed CText to be 64 bit compatibleaap2020-05-161-0/+8
|/
* Fixed typos and made all assert functions optionalbigbossbro082020-05-101-3/+1
|
* defined out asserts.bigbossbro082020-05-101-0/+3
|
* More refs removedSergeanur2020-04-161-1/+1
|
* CText encoding fixesSergeanur2019-10-201-0/+59