Browse code Merge pull request #113 from ocornut/2015-01-truetype Merge - TTF font loading, mulitple fonts, Image support docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64 v1.63 v1.62 v1.61 v1.60 v1.53 v1.52 v1.51 v1.50 v1.49 v1.48 v1.47 v1.46 v1.45 v1.44 v1.43 v1.42 v1.41 v1.40 v1.38 v1.37 v1.36 v1.35 v1.34 v1.33b v1.33 v1.32 v1.31 v1.30

commit b87f9a19c8c44c72b7ee01a6e814162506568be7 2 parents a3e368a + 7e2305e omar authored on 18 Jan 2015

Showing 38 changed files

• README.md
• examples/directx11_example/directx11_example.vcxproj
• examples/directx11_example/directx11_example.vcxproj.filters
• examples/directx11_example/main.cpp
• examples/directx9_example/directx9_example.vcxproj
• examples/directx9_example/directx9_example.vcxproj.filters
• examples/directx9_example/main.cpp
• examples/opengl3_example/main.cpp
• examples/opengl3_example/opengl3_example.vcxproj
• examples/opengl3_example/opengl3_example.vcxproj.filters
• examples/opengl_example/ProggyClean.ttf
• examples/opengl_example/main.cpp
• examples/opengl_example/opengl_example.vcxproj
• examples/opengl_example/opengl_example.vcxproj.filters
• examples/shared/README.txt
• examples/shared/stb_image.h
• extra_fonts/Karla-Regular.ttf
• extra_fonts/ProggyClean.ttf
• extra_fonts/ProggyClean.zip
• extra_fonts/ProggySmall.zip
• extra_fonts/ProggyTiny.ttf
• extra_fonts/README.txt
• extra_fonts/courier_new_16.fnt
• extra_fonts/courier_new_16.png
• extra_fonts/courier_new_18.fnt
• extra_fonts/courier_new_18.png
• extra_fonts/mplus-2m-medium_18.fnt
• extra_fonts/mplus-2m-medium_18.png
• extra_fonts/proggy_clean_13.fnt
• extra_fonts/proggy_clean_13.png
• extra_fonts/proggy_small_12.fnt
• extra_fonts/proggy_small_12.png
• extra_fonts/proggy_small_14.fnt
• extra_fonts/proggy_small_14.png
• imgui.cpp
• imgui.h
• stb_rect_pack.h
• stb_truetype.h

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/directx11_example/directx11_example.vcxproj

Ignore Space Show notes View examples/directx11_example/directx11_example.vcxproj.filters

Ignore Space Show notes View examples/directx11_example/main.cpp

Ignore Space Show notes View examples/directx9_example/directx9_example.vcxproj

Ignore Space Show notes View examples/directx9_example/directx9_example.vcxproj.filters

Ignore Space Show notes View examples/directx9_example/main.cpp

Ignore Space Show notes View examples/opengl3_example/main.cpp

Ignore Space Show notes View examples/opengl3_example/opengl3_example.vcxproj

Ignore Space Show notes View examples/opengl3_example/opengl3_example.vcxproj.filters

Ignore Space Show notes View examples/opengl_example/ProggyClean.ttf 0 → 100644
Not supported

Ignore Space Show notes View examples/opengl_example/main.cpp

Ignore Space Show notes View examples/opengl_example/opengl_example.vcxproj

Ignore Space Show notes View examples/opengl_example/opengl_example.vcxproj.filters

Show notes View examples/shared/README.txt 100644 → 0

Show notes View examples/shared/stb_image.h 100644 → 0

Ignore Space Show notes View extra_fonts/Karla-Regular.ttf 0 → 100644
Not supported

Ignore Space Show notes View extra_fonts/ProggyClean.ttf 0 → 100644
Not supported

Show notes View extra_fonts/ProggyClean.zip 100644 → 0
Not supported

Show notes View extra_fonts/ProggySmall.zip 100644 → 0
Not supported

Ignore Space Show notes View extra_fonts/ProggyTiny.ttf 0 → 100644
Not supported

Ignore Space Show notes View extra_fonts/README.txt

Show notes View extra_fonts/courier_new_16.fnt 100644 → 0
Not supported

Show notes View extra_fonts/courier_new_16.png 100644 → 0

Show notes View extra_fonts/courier_new_18.fnt 100644 → 0
Not supported

Show notes View extra_fonts/courier_new_18.png 100644 → 0

Show notes View extra_fonts/mplus-2m-medium_18.fnt 100644 → 0
Not supported

Show notes View extra_fonts/mplus-2m-medium_18.png 100644 → 0

Show notes View extra_fonts/proggy_clean_13.fnt 100644 → 0
Not supported

Show notes View extra_fonts/proggy_clean_13.png 100644 → 0

Show notes View extra_fonts/proggy_small_12.fnt 100644 → 0
Not supported

Show notes View extra_fonts/proggy_small_12.png 100644 → 0

Show notes View extra_fonts/proggy_small_14.fnt 100644 → 0
Not supported

Show notes View extra_fonts/proggy_small_14.png 100644 → 0

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View stb_rect_pack.h 0 → 100644

Ignore Space Show notes View stb_truetype.h 0 → 100644

Show line notes below