Commit graph

10 commits

Author SHA1 Message Date
Sergeanur
b26eec5daf Merge remote-tracking branch 'origin/master' into miami
# 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
2020-06-29 12:56:50 +03:00
Fire-Head
1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
aap
c5205a89ee CCamera done 2020-06-20 14:54:11 +02:00
Fire-Head
6a32981ba5 VC CParticle done 2020-05-27 02:16:31 +03:00
eray orçunus
acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
aap
31f9bb566b implemented most of timecycle and mblur 2020-05-06 00:53:26 +02:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
_AG
69b5c9f1e0 Update Frontend. 2019-07-03 17:30:26 +02:00
aap
84204471a5 more high level functions 2019-05-31 11:44:43 +02:00
aap
852d8298b1 added CMBlur 2019-05-30 13:35:13 +02:00