omar
|
a848807847
|
Minor inconsequential merges from Master/Docking branches
|
2018-09-05 11:51:45 +02:00 |
|
omar
|
bdb30d7145
|
Merge branch 'master' into viewport
|
2018-09-05 11:08:57 +02:00 |
|
omar
|
897e5c6231
|
Viewport: Moved code following refactor. (#2036, #1542)
|
2018-09-05 11:08:44 +02:00 |
|
omar
|
40db2ca098
|
Fixed a build issue with non-Cygwin GCC under Windows.
|
2018-09-04 18:58:20 +02:00 |
|
omar
|
5451cb7e1e
|
Readme, Changelog (#2059)
|
2018-09-04 11:48:08 +02:00 |
|
omar
|
1007873d94
|
Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.
|
2018-09-03 19:51:22 +02:00 |
|
Jiří Šebele
|
f8b7e4d94f
|
Examples: imgui_impl_opengl3 Fix GLAD error condition (#2059, #2002)
`gladLoadGL` returns 0 on fail, not the other way around.
|
2018-09-03 19:36:02 +02:00 |
|
omar
|
d07f494305
|
Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. (#2036)
Renamed RoundScalarWithFormat -> RoundScalarWithFormatT.
Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT
|
2018-09-03 14:49:13 +02:00 |
|
omar
|
bcb1441ce7
|
Version 1.65 WIP
|
2018-09-03 14:38:04 +02:00 |
|
omar
|
fd201a90f1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-08-31 18:39:02 +02:00 |
|
omar
|
767649afb1
|
Fix missing include on some systems to use intptr_t. (#2036, #2054)
v1.64
|
2018-08-31 18:07:47 +02:00 |
|
omar
|
5d40d295b3
|
Comments, readme updates
|
2018-08-31 11:37:14 +02:00 |
|
Omar Cornut
|
be6ea86f8d
|
OSX: Added imgui_widgets.cpp to xcode project files.
|
2018-08-31 11:29:25 +02:00 |
|
omar
|
a52ce7ac8b
|
Merge branch 'master' into viewport
|
2018-08-31 11:14:05 +02:00 |
|
omar
|
fd90afef43
|
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) (#2036, #1542)
|
2018-08-31 11:11:18 +02:00 |
|
omar
|
5207afa0dd
|
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) (#2036, #1542)
|
2018-08-31 11:06:21 +02:00 |
|
omar
|
9174958b43
|
imgui_stl: Comments (#2035)
|
2018-08-31 10:53:38 +02:00 |
|
omar
|
0699310b9c
|
Merge branch 'viewport_164' into viewport
|
2018-08-31 10:28:37 +02:00 |
|
omar
|
0c24fe276c
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
|
2018-08-31 10:28:21 +02:00 |
|
omar
|
36435b43c7
|
Merge branch 'master_164'
|
2018-08-31 10:12:49 +02:00 |
|
omar
|
48db5713d6
|
Version 1.64
|
2018-08-31 10:00:03 +02:00 |
|
omar
|
38cfcf9fbc
|
Tweak comments and indexes
|
2018-08-31 09:59:58 +02:00 |
|
omar
|
c83391262e
|
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)
|
2018-08-30 21:21:14 +02:00 |
|
omar
|
00262d51ad
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)
|
2018-08-30 21:19:30 +02:00 |
|
omar
|
d7c04ccbfb
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)
|
2018-08-30 21:18:16 +02:00 |
|
omar
|
b1f263b34b
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)
|
2018-08-30 21:16:30 +02:00 |
|
omar
|
a58e4dfd0f
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
2018-08-30 21:16:23 +02:00 |
|
omar
|
8a216fe756
|
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)
|
2018-08-30 21:15:12 +02:00 |
|
omar
|
fd2bfb7e07
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)
|
2018-08-30 21:00:51 +02:00 |
|
omar
|
064b949bc2
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)
|
2018-08-30 20:59:24 +02:00 |
|
omar
|
2a0d26e603
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)
|
2018-08-30 20:58:36 +02:00 |
|
omar
|
df37a156e8
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
2018-08-30 20:51:57 +02:00 |
|
omar
|
18d6490dbd
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
|
2018-08-30 20:36:37 +02:00 |
|
omar
|
346f83e014
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
|
2018-08-30 19:41:02 +02:00 |
|
omar
|
fefcc77f13
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
|
2018-08-30 19:40:40 +02:00 |
|
omar
|
b6cdfef442
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
|
2018-08-30 19:38:44 +02:00 |
|
omar
|
172e426ba9
|
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)
|
2018-08-30 19:36:59 +02:00 |
|
omar
|
f74d9ec7f7
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) (#2036, #787)
|
2018-08-30 19:36:40 +02:00 |
|
omar
|
9093166eea
|
Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) (#2036, #787)
|
2018-08-30 19:35:19 +02:00 |
|
omar
|
f5ed5478e1
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)
|
2018-08-30 19:35:12 +02:00 |
|
omar
|
9a4234ea8e
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)
|
2018-08-30 19:35:06 +02:00 |
|
omar
|
af002dc861
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)
|
2018-08-30 19:34:48 +02:00 |
|
omar
|
adeb993122
|
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)
|
2018-08-30 19:33:02 +02:00 |
|
omar
|
81bc4265e5
|
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)
|
2018-08-30 19:32:52 +02:00 |
|
omar
|
a44c5f7afe
|
Refactor: Internals: Moved various functions in imgui.cpp (#2036)
|
2018-08-30 19:30:17 +02:00 |
|
omar
|
66b51940bd
|
Refactor: Moved README, ChangeLog, TODO files to docs/ folder + update Changelog. (#2036)
|
2018-08-30 19:30:10 +02:00 |
|
omar
|
d4e49a2697
|
Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
2018-08-30 19:29:46 +02:00 |
|
omar
|
728b2ef026
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
|
2018-08-30 19:23:11 +02:00 |
|
omar
|
cda45737ab
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
|
2018-08-30 19:23:11 +02:00 |
|
omar
|
acf3cc4c3f
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
|
2018-08-30 19:23:11 +02:00 |
|