Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-06-29 | 1 | -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 ps2menu | Fire_Head | 2020-06-29 | 1 | -0/+8 |
| |\ | |||||
| | * | fixed CText to be 64 bit compatible | aap | 2020-05-16 | 1 | -0/+8 |
| | | | |||||
| * | | mips overdose | Fire-Head | 2020-06-27 | 1 | -0/+2 |
| |/ | |||||
* | | CText | Sergeanur | 2020-05-18 | 1 | -4/+37 |
| | | |||||
* | | fixed CText to be 64 bit compatible | aap | 2020-05-16 | 1 | -0/+8 |
|/ | |||||
* | Fixed typos and made all assert functions optional | bigbossbro08 | 2020-05-10 | 1 | -3/+1 |
| | |||||
* | defined out asserts. | bigbossbro08 | 2020-05-10 | 1 | -0/+3 |
| | |||||
* | More refs removed | Sergeanur | 2020-04-16 | 1 | -1/+1 |
| | |||||
* | CText encoding fixes | Sergeanur | 2019-10-20 | 1 | -0/+59 |