ocornut
|
18724f021a
|
Merge branch 'JuJuBoSc-master'
|
2015-12-03 18:32:33 +00:00 |
|
ocornut
|
9596e6f794
|
Examples: DirectX10: Minor tweaks, updated to latest example changes (#424)
|
2015-12-03 18:32:01 +00:00 |
|
ocornut
|
dadd03fc11
|
Examples: DirectX10: Fix warning, disable debug device, add ignore list (#424)
|
2015-12-03 18:20:48 +00:00 |
|
ocornut
|
59f0db6f15
|
Merge branch 'master' of https://github.com/JuJuBoSc/imgui into JuJuBoSc-master
|
2015-12-03 18:18:14 +00:00 |
|
Julian Bosch
|
32c1a3e46c
|
Removed d3d11 references
|
2015-12-03 13:39:03 +01:00 |
|
ocornut
|
730e8119fe
|
Updated stb_truetype 1.07 -> 1.08
|
2015-12-03 12:35:27 +00:00 |
|
Julian Bosch
|
1f3a0e78cc
|
Ported d3d11 renderer to d3d10
|
2015-12-03 13:18:35 +01:00 |
|
omar
|
fe2972e8b2
|
Merge pull request #420 from RaptorFactor/master
Examples: DX11: Compile shaders with lower features levels.
|
2015-11-30 19:36:06 +00:00 |
|
Joshua Boyce
|
6adf644448
|
Allow DX11 renderer to be used with devices with lower feature levels.
|
2015-12-01 05:08:30 +11:00 |
|
ocornut
|
1b7aee7b9d
|
Examples: DX11: Remove debug flag (#415)
|
2015-11-30 10:22:46 +00:00 |
|
ocornut
|
632f9ec36a
|
Commenting asserts
|
2015-11-30 09:45:45 +00:00 |
|
ocornut
|
5f8200d52c
|
TreeNode/CollapsingHeader: some minor cleanup of that horrible function.
|
2015-11-29 22:38:58 +00:00 |
|
ocornut
|
d1b4159b51
|
TreeNode/CollapsingHeader: some minor cleanup of that horrible function.
|
2015-11-29 22:25:13 +00:00 |
|
ocornut
|
9dca2ca960
|
Comments & spacing
|
2015-11-29 22:01:26 +00:00 |
|
ocornut
|
b7e1ae4bf9
|
Added comment on using PushFont() before building the font (#232)
|
2015-11-29 21:33:51 +00:00 |
|
ocornut
|
a500c0daf7
|
Demo: some TreeNode layout examples (#414, #282)
|
2015-11-29 21:02:15 +00:00 |
|
ocornut
|
4006fb77bc
|
TreeNode,CollapsingHeader: sizing fixes to support laying out item on same line before/after (#414, #282)
|
2015-11-29 20:35:58 +00:00 |
|
ocornut
|
546962351b
|
Internal minor renaming
|
2015-11-29 20:27:48 +00:00 |
|
ocornut
|
6cee2fca94
|
Examples: Not clearing input data/tex data in atlas (will be required for dynamic atlas anyway). Effectively fix resizing in DX examples.
+ Standardized comments.
|
2015-11-29 14:54:05 +00:00 |
|
ocornut
|
6269859315
|
Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing.
|
2015-11-29 14:15:07 +00:00 |
|
ocornut
|
3aebddc4ac
|
Tweak GetGlyphRangesJapanese() to it is easier to modify
|
2015-11-29 11:55:54 +00:00 |
|
ocornut
|
94ec3d534e
|
Examples: Header comments.
|
2015-11-29 11:25:15 +00:00 |
|
ocornut
|
6800939e73
|
Examples: Header comments.
|
2015-11-29 11:19:30 +00:00 |
|
ocornut
|
5c52e9ec0d
|
Examples: Clarified comments. Removed font merging example from comments.
|
2015-11-29 11:11:03 +00:00 |
|
ocornut
|
d673db3092
|
Examples: Added README into the Visual Studio solution to people are less likely to miss it.
|
2015-11-29 11:01:50 +00:00 |
|
ocornut
|
9735563b65
|
Additional comments for new users
|
2015-11-29 10:53:03 +00:00 |
|
ocornut
|
eb6575508f
|
Demo: Tweaked Clipping example.
|
2015-11-29 10:29:06 +00:00 |
|
ocornut
|
b2b4bbe5ea
|
Demo: Fixed variable shadowing warning.
|
2015-11-29 10:25:55 +00:00 |
|
ocornut
|
79b09e7d10
|
Fixed int>void* warnings for 64-bits architectures and fancy warnings
|
2015-11-29 10:20:50 +00:00 |
|
ocornut
|
f505a372fd
|
Speculative build fix for old versions of Visual Studio compiler
|
2015-11-28 20:00:40 +00:00 |
|
ocornut
|
ba77166432
|
Demo: comments (#414)
|
2015-11-28 17:23:32 +00:00 |
|
ocornut
|
32d2768734
|
Demo: Moved property editor demo to its own mini example applet (#414)
|
2015-11-28 17:16:59 +00:00 |
|
ocornut
|
d3df39fed1
|
Columns: Added Property Tree demo among tidying up demos (#125, #414)
|
2015-11-28 16:44:09 +00:00 |
|
ocornut
|
4ca34a879d
|
Columns: Fixed bug with indentation within columns, also making code shorter/faster (#414, #125)
|
2015-11-28 16:36:25 +00:00 |
|
ocornut
|
a9009b133c
|
Columns: Undo accidental change from 807d4ff92c
|
2015-11-28 15:52:57 +00:00 |
|
ocornut
|
6e2e60ffad
|
Merge branch 'master' of https://github.com/ocornut/imgui
|
2015-11-28 15:35:22 +00:00 |
|
ocornut
|
e4ba6e525b
|
Columns:: columns set with no implicit id include the columns count into the id to avoid collisions (#125)
|
2015-11-28 15:35:10 +00:00 |
|
ocornut
|
807d4ff92c
|
Columns: minor tidying up while investigating severe issues with indenting within columns (#414)
|
2015-11-28 12:14:50 +00:00 |
|
omar
|
c0ec9f4e63
|
Merge pull request #416 from zryan3/bugfix/sdl2_typos
Examples:SDL: fixed comment referencing GLFW.
|
2015-11-28 09:36:06 +00:00 |
|
zryan3
|
aa6cb32bd4
|
fixed text referencing GLFW library in SDL examples
|
2015-11-27 23:04:35 -07:00 |
|
omar
|
b4556c404d
|
Update README.md
Removed paragraph.
|
2015-11-27 23:43:19 +00:00 |
|
omar
|
bfacd250df
|
Update README.md
|
2015-11-27 23:42:07 +00:00 |
|
ocornut
|
58b23b4785
|
Columns: avoid growing ColumnsData vector when closing a window with no columns (#125)
(Will break calling GetColumnOffset() when there's no column but it
would only have worked after the first frame anyway, so basically it
didn't work)
|
2015-11-26 23:07:10 +00:00 |
|
ocornut
|
1aac69c937
|
Columns: tidying up, moving OffsetT to a ImGuiColumnData structure
|
2015-11-26 23:01:15 +00:00 |
|
ocornut
|
95138fa8d6
|
Merge branch 'master' of https://github.com/ocornut/imgui
|
2015-11-26 22:43:28 +00:00 |
|
ocornut
|
3102c0c97e
|
Rename internal ColumnsStartX to IndentX, makes more sense
|
2015-11-26 22:43:21 +00:00 |
|
omar
|
60b75d78ea
|
Update README.md
|
2015-11-24 19:13:05 +00:00 |
|
ocornut
|
10ba61f882
|
Added links
|
2015-11-24 15:35:07 +00:00 |
|
ocornut
|
5d84f4b450
|
Update README.md - faq
|
2015-11-22 23:16:19 +00:00 |
|
omar
|
b959c74488
|
Update README.md - faq
|
2015-11-22 23:12:50 +00:00 |
|