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)
|
2018-08-31 18:07:47 +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
|
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
|
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
|
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
|
d4e49a2697
|
Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
2018-08-30 19:29:46 +02:00 |
|
omar
|
521405488b
|
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:21:50 +02:00 |
|
omar
|
24dfa0c957
|
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:12:33 +02:00 |
|
omar
|
158a65c98f
|
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:04:49 +02:00 |
|
omar
|
6caf074bd5
|
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:04:42 +02:00 |
|
omar
|
905e14f384
|
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:04:36 +02:00 |
|
omar
|
4be79a8955
|
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:04:04 +02:00 |
|
omar
|
2d952504ed
|
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:01:05 +02:00 |
|
omar
|
43219d36a6
|
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:00:59 +02:00 |
|
omar
|
99b27488e7
|
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:00:52 +02:00 |
|
omar
|
18972c5513
|
Refactor: Added imgui_widgets.cpp headers to easily merge in the functions in all our branches. (#2036)
|
2018-08-30 19:00:42 +02:00 |
|
omar
|
e312363007
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
2018-08-30 19:00:33 +02:00 |
|
omar
|
2714f8fa23
|
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:46 +02:00 |
|
omar
|
c25f48b902
|
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:46 +02:00 |
|
omar
|
ad0bfdcd95
|
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:45 +02:00 |
|
omar
|
5dc954f5d7
|
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:45 +02:00 |
|
omar
|
a265c62636
|
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:45 +02:00 |
|
omar
|
0e9577d0da
|
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:44 +02:00 |
|
omar
|
f26b8c1e07
|
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 14:55:27 +02:00 |
|
omar
|
6468a3c0ce
|
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 14:50:32 +02:00 |
|
omar
|
3eaa063984
|
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 14:50:32 +02:00 |
|
omar
|
52c115fb2c
|
Refactor: Added imgui_widgets.cpp headers to easily merge in the functions in all our branches. (#2036)
|
2018-08-30 14:50:32 +02:00 |
|
omar
|
01586d33f3
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
2018-08-30 14:29:11 +02:00 |
|