Merge remote-tracking branch 'tom/master' into dev
Merge remote-tracking branch 'tom/master' into dev
Merge remote-tracking branch 'tom/master' into dev
initial minimap support
fixed conflict in fog map
added minimap
added minimap shaders
trying to fix this component bug