Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-06-29 | 1 | -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 ps2menu | Fire_Head | 2020-06-29 | 1 | -2/+2 |
| |\ | |||||
| | * | CCam fixes yet again | aap | 2020-06-16 | 1 | -1/+1 |
| | | | |||||
| | * | CTimer fix | aap | 2020-06-01 | 1 | -2/+2 |
| | | | |||||
| * | | mips overdose | Fire-Head | 2020-06-27 | 1 | -0/+1 |
| | | | |||||
* | | | CCam done | aap | 2020-06-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #611 from erorcun/miami | erorcun | 2020-06-01 | 1 | -3/+9 |
|\ \ \ | | | | | | | | | DrawStandardMenus, VC menu array and minor fixes | ||||
| * | | | DrawStandardMenus, VC menu array and minor fixes | eray orçunus | 2020-06-01 | 1 | -3/+9 |
| | |/ | |/| | |||||
* / | | CTimer fix | aap | 2020-06-01 | 1 | -2/+2 |
|/ / | |||||
* / | fixes for CPhysical and friends | aap | 2020-05-22 | 1 | -1/+1 |
|/ | |||||
* | Fix water UV on high FPS and inverted free camera | Sergeanur | 2020-05-08 | 1 | -0/+5 |
| | |||||
* | rem refs | Fire-Head | 2020-04-17 | 1 | -10/+10 |
| | |||||
* | Fixes | Wes Hampson | 2020-04-13 | 1 | -0/+3 |
| | |||||
* | Merge pull request #400 from erorcun/erorcun | erorcun | 2020-04-11 | 1 | -0/+4 |
|\ | | | | | CMenuManager done and CHud fixes | ||||
| * | CMenuManager done and CHud fixes | eray orçunus | 2020-04-11 | 1 | -0/+4 |
| | | |||||
* | | Fix cutscene camera latency | Sergeanur | 2020-04-11 | 1 | -0/+1 |
|/ | |||||
* | timebars | Sergeanur | 2020-03-31 | 1 | -0/+1 |
| | |||||
* | CCopPed 2 and fixes | eray orçunus | 2020-03-26 | 1 | -6/+7 |
| | |||||
* | Add Load/Save functions | Wes Hampson | 2020-03-11 | 1 | -1/+2 |
| | |||||
* | sampman done | Fire-Head | 2019-08-02 | 1 | -0/+1 |
| | |||||
* | the great reorganization | aap | 2019-07-07 | 1 | -0/+51 |