omar
|
a52ce7ac8b
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
fd90afef43
|
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) (#2036, #1542)
|
6 years ago |
|
omar
|
5207afa0dd
|
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) (#2036, #1542)
|
6 years ago |
|
omar
|
9174958b43
|
imgui_stl: Comments (#2035)
|
6 years ago |
|
omar
|
0699310b9c
|
Merge branch 'viewport_164' into viewport
|
6 years ago |
|
omar
|
0c24fe276c
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
36435b43c7
|
Merge branch 'master_164'
|
6 years ago |
|
omar
|
48db5713d6
|
Version 1.64
|
6 years ago |
|
omar
|
38cfcf9fbc
|
Tweak comments and indexes
|
6 years ago |
|
omar
|
c83391262e
|
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)
|
6 years ago |
|
omar
|
00262d51ad
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)
|
6 years ago |
|
omar
|
d7c04ccbfb
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)
|
6 years ago |
|
omar
|
b1f263b34b
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)
|
6 years ago |
|
omar
|
a58e4dfd0f
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
6 years ago |
|
omar
|
8a216fe756
|
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)
|
6 years ago |
|
omar
|
fd2bfb7e07
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)
|
6 years ago |
|
omar
|
064b949bc2
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)
|
6 years ago |
|
omar
|
2a0d26e603
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)
|
6 years ago |
|
omar
|
df37a156e8
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
6 years ago |
|
omar
|
18d6490dbd
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
346f83e014
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
|
6 years ago |
|
omar
|
fefcc77f13
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
|
6 years ago |
|
omar
|
b6cdfef442
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
|
6 years ago |
|
omar
|
172e426ba9
|
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)
|
6 years ago |
|
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)
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
f5ed5478e1
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)
|
6 years ago |
|
omar
|
9a4234ea8e
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)
|
6 years ago |
|
omar
|
af002dc861
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)
|
6 years ago |
|
omar
|
adeb993122
|
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)
|
6 years ago |
|
omar
|
81bc4265e5
|
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)
|
6 years ago |
|
omar
|
a44c5f7afe
|
Refactor: Internals: Moved various functions in imgui.cpp (#2036)
|
6 years ago |
|
omar
|
66b51940bd
|
Refactor: Moved README, ChangeLog, TODO files to docs/ folder + update Changelog. (#2036)
|
6 years ago |
|
omar
|
d4e49a2697
|
Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
728b2ef026
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
|
6 years ago |
|
omar
|
cda45737ab
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
|
6 years ago |
|
omar
|
acf3cc4c3f
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
|
6 years ago |
|
omar
|
8a6fd237f6
|
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)
|
6 years ago |
|
omar
|
84eb2682b7
|
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)
|
6 years ago |
|
omar
|
73052dc00c
|
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)
|
6 years ago |
|
omar
|
6bda59e5b7
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)
|
6 years ago |
|
omar
|
60ee4de56d
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)
|
6 years ago |
|
omar
|
ce58795bdf
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)
|
6 years ago |
|
omar
|
f2926f910f
|
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)
|
6 years ago |
|
omar
|
15172f0742
|
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)
|
6 years ago |
|
omar
|
98f618ed18
|
Refactor: Internals: Moved various functions in imgui.cpp (#2036)
|
6 years ago |
|
omar
|
5afd4b61f2
|
Refactor: Moved README, ChangeLog, TODO files to docs/ folder + update Changelog. (#2036)
|
6 years ago |
|
omar
|
521405488b
|
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
24dfa0c957
|
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
158a65c98f
|
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |