Merge upstream at v1.60

.github/CONTRIBUTING.md

@@ -0,0 +1,31 @@
+## How to create an Issue
+
+Hello! 
+
+You may use the Issue Tracker to submit bug reports, feature requests or suggestions. You may ask for help or advice as well. However please read this wall of text before doing so. The amount of incomplete or ambiguous requests occasionally becomes overwhelming, so please do your best to clarify your request. Thank you!
+
+**Prerequisites for new users of dear imgui:**
+- Please read the FAQ in imgui.cpp.
+- Please read misc/fonts/README.txt if your question relates to fonts or text.
+- Please run ImGui::ShowDemoWindow() to explore the demo and its sources.
+- Please use the Search function of GitHub to look for similar issues. You may also browse issues by tags.
+- Please use the Search function of your IDE to search in the code for comments related to your situation.
+- If you get a assert, use a debugger to locate the line triggering it and read the comments around the assert.
+
+**Guidelines to report an issue or ask a question:**
+- Try to provide a Minimal, Complete and Verifiable Example ([MCVE](https://stackoverflow.com/help/mcve)) to demonstrate your problem. An ideal submission includes a small piece of code that anyone can paste in one of the examples/ application to understand and reproduce it. Narrowing your problem to its shortest and purest form is often the easiest way to understand it. Often while creating the MCVE you will end up solving the problem!
+- Try to attach screenshots to clarify the context. They often convey useful information that are omitted by the description. You can drag pictures/files here (prefer github attachments over 3rd party hosting).
+- If you are discussing an assert or a crash, please provide a debugger callstack. 
+- Please provide your imgui version number.
+- Please state if you have made substantial modifications to your copy of imgui. 
+- When discussing issues related to rendering or inputs, please state which OS you are using, and if you are using a vanilla copy of one of the back end (imgui_impl_xxx files), or a modified one, or if you built your own.
+- When requesting a new feature, please describe the usage context (how you intend to use it, why you need it, etc.).
+- Due to frequent abuse of this service from a certain category of users, if your GitHub account is anonymous and was created five minutes ago please understand that your post will receive more scrutiny and less patience for incomplete questions.
+
+If you have been using dear imgui for a while and/or have been using C/C++ for several years and/or have demonstrated good behavior here, it is ok to not fullfill every item to the letter. Those are guidelines and experienced users of dear imgui will know what information are useful in a given context.
+
+## How to create an Pull Request
+
+- If you are adding a feature, please describe the usage context (how you intend to use it, why you need it, etc.).
+- Try to attach screenshots to clarify the context and demonstrate the feature at a glance. You can drag pictures/files here (prefer github attachments over 3rd party hosting).
+- Make sure you create a branch for the pull request. In Git, 1 PR is associated to 1 branch. If you keep pushing to the same branch after you submitted the PR, your new commits will appear in the PR (we can still cherry-pick individual commits).

.github/issue_template.md

@@ -0,0 +1,12 @@
+You may use the Issue Tracker to ask for help and submit bug reports, feature requests or suggestions. 
+PLEASE CAREFULLY READ THIS DOCUMENT before doing so:
+[CONTRIBUTING.md](https://github.com/ocornut/imgui/blob/master/.github/CONTRIBUTING.md).
+
+You can include code snippets using `Begin()` for short in-line snippets, or:
+```cpp
+ImGui::Begin("Hello");
+ImGui::ThisIsMoreCode();
+```
+For multiline snippets.
+
+(Clear this form before submitting your issue. Please read the CONTRIBUTING.md file!)

.github/pull_request_template.md

@@ -0,0 +1,6 @@
+- If you are adding a feature, please explain the context of the change: what do you need the feature for?
+- Try to attach screenshots to clarify the context and demonstrate the feature at a glance.
+- Make sure you create a branch for the pull request. In Git, 1 PR is associated to 1 branch. If you keep pushing to the same branch after you submitted the PR, your new commits will appear in the PR.
+- You can read [CONTRIBUTING.md](https://github.com/ocornut/imgui/blob/master/.github/CONTRIBUTING.md) for more details.
+
+(Clear this form before submitting your PR)

.travis.yml

@@ -1,4 +1,6 @@
 language: cpp
+sudo: required
+dist: trusty
 
 os:
   - linux
@@ -9,8 +11,19 @@ compiler:
   - clang
 
 before_install:
-  - if [ $TRAVIS_OS_NAME == linux ]; then sudo add-apt-repository -y ppa:pyglfw/pyglfw && sudo apt-add-repository --yes ppa:zoogie/sdl2-snapshots && sudo apt-get update -qq && sudo apt-get install -y --no-install-recommends libglfw3-dev libxrandr-dev libxi-dev libxxf86vm-dev libsdl2-dev; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install glfw3 && brew install sdl2; fi
+  - if [ $TRAVIS_OS_NAME == linux ]; then 
+       sudo apt-get update -qq;
+       sudo apt-get install -y --no-install-recommends libxrandr-dev libxi-dev libxxf86vm-dev libsdl2-dev;
+       wget https://github.com/glfw/glfw/releases/download/3.2.1/glfw-3.2.1.zip;
+       unzip glfw-3.2.1.zip && cd glfw-3.2.1; 
+       cmake -DBUILD_SHARED_LIBS=true -DGLFW_BUILD_EXAMPLES=false -DGLFW_BUILD_TESTS=false -DGLFW_BUILD_DOCS=false .;
+       sudo make -j $CPU_NUM install && cd ..;
+    fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then 
+       brew update;
+       brew install glfw3;
+       brew install sdl2;
+    fi
 
 script: 
   - make -C examples/opengl2_example