Commit Graph

13 Commits

Author SHA1 Message Date
Sergeanur
30384bb4ef Merge branch 'master' into miami
# Conflicts:
#	src/render/Credits.cpp
2020-07-17 21:15:47 +03:00
Sergeanur
27e1fa1d28 Add missing f's 2020-07-17 17:56:59 +03:00
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
eray orçunus
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Filip Gawin
c88c2115e2 Remove unneeded double to float casts 2020-03-22 17:30:54 +01:00
Sergeanur
6d61f678e2 Fixed credits not working 2019-10-27 16:05:47 +02:00
_AG
69b5c9f1e0 Update Frontend. 2019-07-03 17:30:26 +02:00
aap
b63c87e8a6 implemented splashes; fixed zones 2019-06-01 23:28:13 +02:00
aap
f50cf32b87 CCredits name cleanup 2019-05-31 00:39:25 +02:00
aap
454276f940 added CCredits 2019-05-31 00:32:50 +02:00