summaryrefslogtreecommitdiffstats
path: root/src/render/Timecycle.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-221-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/CutsceneMgr.cpp # src/control/CarCtrl.cpp # src/control/Script.cpp # src/control/Script2.cpp # src/core/Frontend.cpp # src/core/main.cpp # src/entities/Physical.cpp # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/text/Messages.cpp # src/vehicles/Cranes.cpp # src/vehicles/Transmission.cpp
| * get rid of most --MIAMI commentswithmorten2021-01-221-2/+0
| |
* | timecycle back to normalaap2021-01-081-1/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-01-081-1/+1
|\| | | | | | | | | # Conflicts: # src/render/Timecycle.cpp
| * little fixesaap2021-01-081-2/+3
| |
* | timecycle; some renderingaap2021-01-081-54/+225
|/
* Stats(except displaying), PlayerInfo, marker fixeray orçunus2020-08-141-1/+1
|
* timecycle doneaap2020-08-091-98/+227
|
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-2/+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-1/+1
| |\
| | * small fixesaap2020-05-251-1/+1
| | |
| * | mips overdoseFire-Head2020-06-271-2/+2
| |/
* | fixaap2020-05-261-1/+5
| |
* | Merge pull request #588 from blingu/miamiaap2020-05-261-1/+1
|\ \ | | | | | | fixed compiler errors
| * | fixed compiler errorsnrb2020-05-241-1/+1
| | |
* | | CVehicleaap2020-05-251-1/+1
|/ /
* / implemented most of timecycle and mbluraap2020-05-061-27/+104
|/
* Try to build with mingwFilip Gawin2020-04-201-3/+3
|
* Remove patchesSergeanur2020-04-171-6/+1
|
* rem refsFire-Head2020-04-171-95/+95
|
* added wrappers around math functionsaap2019-07-101-2/+2
|
* the great reorganizationaap2019-07-071-0/+322