ocornut
|
ab8d2782c6
|
Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
Conflicts:
imgui.cpp
imgui.h
|
2015-01-15 18:07:44 +00:00 |
|
ocornut
|
62ecdd21a5
|
Examples: Added a color slider for the background color + tweak first example use of button.s
|
2015-01-15 09:59:18 +00:00 |
|
ocornut
|
0f4d74d614
|
ImFont::GetTextureData API allow to retrieve 8/32 bits data + lazily load defaults font
Examples: OpenGL3 and DirectX11 back to using 32-bits texture solely for
ease of integration.
|
2015-01-11 21:06:57 +00:00 |
|
ocornut
|
241e8086fa
|
Mde it optional to new() io.Font - however it stills needs to be loaded.
|
2015-01-11 18:27:05 +00:00 |
|
ocornut
|
51df5874a6
|
Examples' Says "OpenGL2" vs "OpenGL3" in title bar.
|
2015-01-11 18:03:40 +00:00 |
|
ocornut
|
a09f426b89
|
TAB to spaces
|
2015-01-11 17:56:43 +00:00 |
|
ocornut
|
5ca563b5a5
|
Speculative fix for warnings for GCC/Clang
|
2015-01-11 17:22:04 +00:00 |
|
ocornut
|
20bb6270bc
|
Examples: all supports TextureID in renderer, added LoadFontTexture() function.
|
2015-01-11 17:17:43 +00:00 |
|
ocornut
|
b3a208901a
|
Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean.
|
2015-01-08 23:35:01 +00:00 |
|
ocornut
|
c1251d2994
|
Examples: Fixed warnings for Clang
|
2015-01-06 17:43:23 +00:00 |
|
ocornut
|
1c657564ac
|
Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to #109
|
2015-01-06 17:35:36 +00:00 |
|
ocornut
|
b3febabc30
|
OpenGL3 example: fix growing of VBO
|
2014-12-22 01:47:34 +00:00 |
|
omar
|
e9e0e36f98
|
New and better Set[Next]Window(Pos|Size|Collapsed) API.
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
|
2014-12-10 19:22:30 +00:00 |
|
omar
|
09bacfbe18
|
OpenGL example: allow resizing window.
|
2014-12-10 15:27:40 +00:00 |
|
omar
|
6523fb263d
|
OpenGL3 example: fixed mouse handling.
|
2014-12-08 17:15:08 +00:00 |
|
ocornut
|
987188d437
|
Fix Clang warning with offsetof() macro? Added -Wall in OpenGL 3 example.
|
2014-12-07 09:58:45 +00:00 |
|
ocornut
|
036ed3ea93
|
OpenGL3 example: unregistered mouse callback for mouse click-release faster than frame interval.
|
2014-12-06 20:43:08 +00:00 |
|
omar
|
2e5b81627f
|
Examples: DirectX11: moved shader to be close to its usage location,
|
2014-12-03 18:46:13 +00:00 |
|
omar
|
52b5376d9b
|
Examples: OpenGL3: cleaned up to match features of OpenGL2 example
|
2014-12-03 18:40:28 +00:00 |
|
omar
|
b02eed3e49
|
Examples: adding title to the top of each examples. Cleaning up file headers.
|
2014-12-03 18:29:46 +00:00 |
|
omar
|
6c9edb6db0
|
Examples: removed LICENSE file from MSVC project.
|
2014-12-03 18:19:05 +00:00 |
|
Olivier Chatry
|
2f176033c6
|
fixed indentation mix, removed some unused code, updated different callback using the example_opengl code.
|
2014-12-03 19:11:23 +01:00 |
|
Olivier Chatry
|
a8d2bc69ed
|
added opengl3 sample, mix from @ocornut and @thelinked
|
2014-12-03 18:37:07 +01:00 |
|