summaryrefslogtreecommitdiff
path: root/src/core/Timer.h
AgeCommit message (Collapse)Author
2020-06-29Merge remote-tracking branch 'origin/master' into miamiSergeanur
# 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
2020-06-29Merge branch 'master' into ps2menuFire_Head
2020-06-28mips overdoseFire-Head
2020-06-16CCam doneaap
2020-06-16CCam fixes yet againaap
2020-06-02Merge pull request #611 from erorcun/miamierorcun
DrawStandardMenus, VC menu array and minor fixes
2020-06-01CTimer fixaap
2020-06-01CTimer fixaap
2020-06-01DrawStandardMenus, VC menu array and minor fixeseray orçunus
2020-05-22fixes for CPhysical and friendsaap
2020-05-08Fix water UV on high FPS and inverted free cameraSergeanur
2020-04-17rem refsFire-Head
2020-04-13FixesWes Hampson
2020-04-12Merge pull request #400 from erorcun/erorcunerorcun
CMenuManager done and CHud fixes
2020-04-12CMenuManager done and CHud fixeseray orçunus
2020-04-11Fix cutscene camera latencySergeanur
2020-03-31timebarsSergeanur
2020-03-26CCopPed 2 and fixeseray orçunus
2020-03-10Add Load/Save functionsWes Hampson
2019-08-02sampman doneFire-Head
2019-07-07the great reorganizationaap
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 06:47:27 +0000