Commit Graph

4 Commits

Author SHA1 Message Date
Nikolay Korolev
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap
d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
Sergeanur
9bb8ebaa10 Make collision code placement more like original (+ small fixes)
# Conflicts:
#	premake5.lua
#	src/CMakeLists.txt
#	src/collision/Collision.cpp
#	src/core/Collision.h
2020-11-16 00:36:54 +02:00
Sergeanur
a6f5f4634c Make collision code placement more like original (+ small fixes) 2020-11-15 19:51:35 +02:00