summaryrefslogtreecommitdiffstats
path: root/src/core/Timer.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-291-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-2/+2
| |\
| | * CCam fixes yet againaap2020-06-161-1/+1
| | |
| | * CTimer fixaap2020-06-011-2/+2
| | |
| * | mips overdoseFire-Head2020-06-271-0/+1
| | |
* | | CCam doneaap2020-06-161-1/+1
| | |
* | | Merge pull request #611 from erorcun/miamierorcun2020-06-011-3/+9
|\ \ \ | | | | | | | | DrawStandardMenus, VC menu array and minor fixes
| * | | DrawStandardMenus, VC menu array and minor fixeseray orçunus2020-06-011-3/+9
| | |/ | |/|
* / | CTimer fixaap2020-06-011-2/+2
|/ /
* / fixes for CPhysical and friendsaap2020-05-221-1/+1
|/
* Fix water UV on high FPS and inverted free cameraSergeanur2020-05-081-0/+5
|
* rem refsFire-Head2020-04-171-10/+10
|
* FixesWes Hampson2020-04-131-0/+3
|
* Merge pull request #400 from erorcun/erorcunerorcun2020-04-111-0/+4
|\ | | | | CMenuManager done and CHud fixes
| * CMenuManager done and CHud fixeseray orçunus2020-04-111-0/+4
| |
* | Fix cutscene camera latencySergeanur2020-04-111-0/+1
|/
* timebarsSergeanur2020-03-311-0/+1
|
* CCopPed 2 and fixeseray orçunus2020-03-261-6/+7
|
* Add Load/Save functionsWes Hampson2020-03-111-1/+2
|
* sampman doneFire-Head2019-08-021-0/+1
|
* the great reorganizationaap2019-07-071-0/+51