| Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
|
|
|
|
This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f.
|
|
This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# src/control/Pickups.cpp
# src/control/RoadBlocks.cpp
# src/core/World.cpp
# src/entities/Entity.cpp
# src/objects/CutsceneHead.cpp
# src/objects/Object.cpp
|
|
This reverts commit 7a3b80a9b7f414967fe59f89ab0fe5416735babe.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit 1eb817de7713ea95bbbcbd7543ffce61ced8ffec.
# Conflicts:
# src/core/Game.cpp
|
|
|
|
This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|