Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'miami' into lcs | Sergeanur | 2021-09-01 | 1 | -53/+48 |
|\ | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/sampman_miles.cpp | ||||
| * | replace ugly else if with switch | Fire-Head | 2021-08-30 | 1 | -53/+48 |
| | | |||||
* | | Onscreen timer | Nikolay Korolev | 2021-08-25 | 2 | -55/+110 |
| | | |||||
* | | Fix clock | Sergeanur | 2021-08-25 | 2 | -3/+3 |
| | | |||||
* | | CAutomobile done | aap | 2021-08-20 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'miami' into lcs | Sergeanur | 2021-08-11 | 2 | -3/+3 |
|\| | | | | | | | | | | | # Conflicts: # src/core/Radar.cpp # src/core/Radar.h | ||||
| * | Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2 | Sergeanur | 2021-08-11 | 1 | -1/+1 |
| | | |||||
| * | Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls | Sergeanur | 2021-08-11 | 1 | -2/+2 |
| | | |||||
* | | merge | Nikolay Korolev | 2021-08-08 | 2 | -1/+5 |
|\| | |||||
| * | merge | Nikolay Korolev | 2021-08-08 | 4 | -3/+7 |
| |\ | |||||
| | * | CVisibilityPlugins and CRenderer fixes | aap | 2021-07-29 | 1 | -1/+4 |
| | | | |||||
| | * | render -> renderer (original name) | Sergeanur | 2021-07-17 | 62 | -0/+21715 |
| | | |||||
| * | CVisibilityPlugins and CRenderer fixes; pulled MLO back in | aap | 2021-07-29 | 1 | -7/+19 |
| | | |||||
* | | CVisibilityPlugins, CRenderer, some fixes | aap | 2021-07-29 | 4 | -162/+278 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/lcs' into lcs | Nikolay Korolev | 2021-07-25 | 1 | -9/+15 |
|\ \ | |||||
| * | | Merge branch 'miami' into lcs | Sergeanur | 2021-07-25 | 1 | -9/+15 |
| |\| | | | | | | | | | | | | | # Conflicts: # src/renderer/Hud.cpp | ||||
| | * | Fix | Sergeanur | 2021-07-25 | 1 | -1/+1 |
| | | | |||||
| | * | Sync fix from master | Sergeanur | 2021-07-25 | 1 | -11/+17 |
| | | | |||||
* | | | low effort save support | Nikolay Korolev | 2021-07-25 | 2 | -307/+313 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/lcs' into lcs | Nikolay Korolev | 2021-07-24 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'miami' into lcs | Sergeanur | 2021-07-17 | 28 | -1564/+1697 |
|/ | | | | | # Conflicts: # premake5.lua | ||||
* | render -> renderer (original name) | Sergeanur | 2021-07-17 | 74 | -0/+31058 |