Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-22 | 1 | -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 comments | withmorten | 2021-01-22 | 1 | -2/+0 |
| | | |||||
* | | timecycle back to normal | aap | 2021-01-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'miami' into lcs | Sergeanur | 2021-01-08 | 1 | -1/+1 |
|\| | | | | | | | | | # Conflicts: # src/render/Timecycle.cpp | ||||
| * | little fixes | aap | 2021-01-08 | 1 | -2/+3 |
| | | |||||
* | | timecycle; some rendering | aap | 2021-01-08 | 1 | -54/+225 |
|/ | |||||
* | Stats(except displaying), PlayerInfo, marker fix | eray orçunus | 2020-08-14 | 1 | -1/+1 |
| | |||||
* | timecycle done | aap | 2020-08-09 | 1 | -98/+227 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-06-29 | 1 | -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 ps2menu | Fire_Head | 2020-06-29 | 1 | -1/+1 |
| |\ | |||||
| | * | small fixes | aap | 2020-05-25 | 1 | -1/+1 |
| | | | |||||
| * | | mips overdose | Fire-Head | 2020-06-27 | 1 | -2/+2 |
| |/ | |||||
* | | fix | aap | 2020-05-26 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #588 from blingu/miami | aap | 2020-05-26 | 1 | -1/+1 |
|\ \ | | | | | | | fixed compiler errors | ||||
| * | | fixed compiler errors | nrb | 2020-05-24 | 1 | -1/+1 |
| | | | |||||
* | | | CVehicle | aap | 2020-05-25 | 1 | -1/+1 |
|/ / | |||||
* / | implemented most of timecycle and mblur | aap | 2020-05-06 | 1 | -27/+104 |
|/ | |||||
* | Try to build with mingw | Filip Gawin | 2020-04-20 | 1 | -3/+3 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -6/+1 |
| | |||||
* | rem refs | Fire-Head | 2020-04-17 | 1 | -95/+95 |
| | |||||
* | added wrappers around math functions | aap | 2019-07-10 | 1 | -2/+2 |
| | |||||
* | the great reorganization | aap | 2019-07-07 | 1 | -0/+322 |