| 
							
							
								 ocornut | 43cb4038c6 | Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp | 2015-04-14 09:51:28 +01:00 |  | 
			
				
					| 
							
							
								 ocornut | d809abbe1c | Examples: DirectX11: tidying up. | 2015-04-09 23:32:36 +01:00 |  | 
			
				
					| 
							
							
								 ocornut | 7ab49f80ca | Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp | 2015-04-09 21:22:06 +01:00 |  | 
			
				
					| 
							
							
								 ocornut | 37f1715bfa | Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types. | 2015-04-09 21:14:52 +01:00 |  | 
			
				
					| 
							
							
								 ocornut | 1746b04065 | Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat | 2015-04-09 21:05:35 +01:00 |  | 
			
				
					| 
							
							
								 ocornut | d25578efd8 | Examples: initializing float + missing comment. | 2015-04-03 12:11:41 +01:00 |  | 
			
				
					| 
							
							
								 ocornut | 3abfb85613 | Comments on font loading, fixed commented out paths and added DroidSans in the list | 2015-03-28 11:48:42 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | cb285c4d35 | Examples: uses SetNextWindowPos/SetNextWindowSize when applicable | 2015-03-16 11:53:36 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | d3e444dfd9 | Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code. | 2015-03-16 10:02:10 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | e97d02a294 | Examples: Fixed Clang warnings in DirectX examples | 2015-03-14 10:49:26 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 7c9bd71512 | Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples | 2015-03-14 10:41:42 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 2b0acc128c | Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples | 2015-03-14 10:32:29 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 8e0f04638d | Examples: Fix includes order to avoid conflicts between DXSDK_DIR and Windows SDK | 2015-03-14 10:24:35 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | e2c4ba21bc | Examples: Added 64-bit projects for MSVC | 2015-03-14 10:09:53 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 0911526424 | Added io.KeyAlt + support in examples apps Currently unused but supported by sample so that more people will have
it set up when menus needs them | 2015-03-13 09:49:38 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | d5b7b8398f | Examples: reference implementations honors drawlist user callbacks. | 2015-03-09 15:26:58 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | f9c833b4a5 | Examples: DirectX9 example cleanup to match DirectX11 structure. | 2015-03-09 14:55:46 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 66a5837ba8 | Examples: DirectX11 example application handles window resizing. | 2015-03-09 14:51:10 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 866fa95aaa | Examples: DirectX9 example application handle window resizing. | 2015-03-09 14:13:29 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | b4165c43ff | Examples: Refactored directx11_example to be easier to copy & paste into user application. | 2015-03-09 13:45:23 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | be9fe9489c | Examples: DirectX examples uses WM_KEYDOWN/WM_KEYUP Fixes pressing Enter in IME being caught by application right after
validating an IME input. | 2015-03-06 21:39:55 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | e269125c3a | Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly. User need to set io.ImeWindowHandle | 2015-03-06 21:11:14 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 386cfada83 | Examples: Windows examples don't link with imm32.lib by default. | 2015-03-06 18:19:21 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 40b04a3701 | Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once | 2015-02-27 09:51:11 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 9c4972ee9d | Examples: msvc: output .exe in project directory (not in solution directory). | 2015-02-24 10:06:13 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 0d63e0ce60 | Examples: DirectX examples applications all have a Console for debugging. | 2015-02-22 13:45:07 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | cb0a4db048 | Calculate frame-rate for the user, as a purely luxurious feature ..and to reduce sample code size a little. | 2015-02-11 18:28:17 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | d65e051a07 | Minor formatting tweaks, comments | 2015-02-11 18:14:39 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | b623f97d9f | Examples: DirectX11: fixed build setting of Release mode. | 2015-02-01 09:33:51 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 35c0842bcf | Examples: DirectX11: fixed handling of unicode character inputs. | 2015-01-31 23:26:53 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 5834297928 | Examples: DirectX11: increasing vertex buffer size (would really need a dynamic buffer size) + Delete unused code | 2015-01-31 21:12:59 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 381c7428c1 | Examples: changed default background color. | 2015-01-31 20:08:43 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | edcf2d3bf6 | Examples: more comments on loading fonts. | 2015-01-18 11:38:14 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 1916a0c78c | Renamed FontAtlas to Fonts. Further cleanup/comments. | 2015-01-18 10:46:49 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 2c31599bcc | ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30 | 2015-01-17 22:15:29 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | cb9a3235be | Removed PixelCenterOffset, uncesssary | 2015-01-17 17:17:18 +00:00 |  | 
			
				
					| 
							
							
								 ocornut | 43c8b5e0d2 | Examples: DirectX11: use linear sampler to be in sync with other examples. | 2015-01-17 16:52:21 +00:00 |  | 
			
				
					| 
							
							
								 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 | a09f426b89 | TAB to spaces | 2015-01-11 17:56:43 +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 | dd8a7655f5 | Fixed DirectX11 example. | 2015-01-08 18:56:47 +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 |  | 
			
				
					| 
							
							
								 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 | 2e5b81627f | Examples: DirectX11: moved shader to be close to its usage location, | 2014-12-03 18:46:13 +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 |  |