diff options
| author | Ray San <[email protected]> | 2017-12-20 13:11:16 +0100 |
|---|---|---|
| committer | Ray San <[email protected]> | 2017-12-20 13:11:16 +0100 |
| commit | c8cb30ece9a8ff487d340d25141bda8d250e123d (patch) | |
| tree | 4156f168d04a6523d914177c4d6b66e9297d2583 | |
| parent | e672c0f925994ecdca3c1d6fe95b062f4c101558 (diff) | |
| parent | 50adafd01e558c496eb3e55878e299cc851aac4c (diff) | |
| download | raylib.com-c8cb30ece9a8ff487d340d25141bda8d250e123d.tar.gz raylib.com-c8cb30ece9a8ff487d340d25141bda8d250e123d.zip | |
Merge branch 'master' of https://github.com/raysan5/raylib.com
| -rw-r--r-- | common/css/main.css | 1 | ||||
| -rw-r--r-- | common/img/icon_gitter.png | bin | 0 -> 1272 bytes | |||
| -rw-r--r-- | examples.html | 4 | ||||
| -rw-r--r-- | examples/src/shaders/shaders_model_shader.c | 4 | ||||
| -rw-r--r-- | games.html | 4 | ||||
| -rw-r--r-- | helpme.html | 4 | ||||
| -rw-r--r-- | images/become_patron.png | bin | 0 -> 3478 bytes | |||
| -rw-r--r-- | index.html | 25 | ||||
| -rw-r--r-- | license.html | 4 |
9 files changed, 13 insertions, 33 deletions
diff --git a/common/css/main.css b/common/css/main.css index 1045295..d714996 100644 --- a/common/css/main.css +++ b/common/css/main.css @@ -70,6 +70,7 @@ p a:hover{text-decoration: none; color:gray;} #itchio{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_itchio.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;} #reddit{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_reddit.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;} #freenode{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_freenode_irc.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;} +#gitter{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_gitter.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;} #facebook{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_facebook.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;} #twitter{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_twitter.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;} #github{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_github.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;} diff --git a/common/img/icon_gitter.png b/common/img/icon_gitter.png Binary files differnew file mode 100644 index 0000000..4bb2d86 --- /dev/null +++ b/common/img/icon_gitter.png diff --git a/examples.html b/examples.html index eb78b13..d37cf4a 100644 --- a/examples.html +++ b/examples.html @@ -43,13 +43,13 @@ <a id="kofi" href="https://ko-fi.com/raysan" target="_blank"></a> <a id="itchio" href="https://raysan5.itch.io" target="_blank"></a> <a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a> - <a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a> + <a id="patreon" href="https://www.patreon.com/raylib" target="_blank"></a> <a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a> <a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a> - <a id="freenode" href="http://webchat.freenode.net/?channels=#raylib" target="_blank"></a> <a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a> <a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a> <a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a> + <a id="gitter" href="https://gitter.im/raylib" target="_blank"></a> <a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a> </div> <div class="menu"> diff --git a/examples/src/shaders/shaders_model_shader.c b/examples/src/shaders/shaders_model_shader.c index f1a349c..b0ad1fd 100644 --- a/examples/src/shaders/shaders_model_shader.c +++ b/examples/src/shaders/shaders_model_shader.c @@ -12,7 +12,7 @@ * This example has been created using raylib 1.3 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2014 Ramon Santamaria (@raysan5) +* Copyright (c) 2014-2017 Ramon Santamaria (@raysan5) * ********************************************************************************************/ @@ -42,7 +42,7 @@ int main() Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position - SetCameraMode(camera, CAMERA_FREE); // Set an orbital camera mode + SetCameraMode(camera, CAMERA_ORBITAL); // Set an orbital camera mode SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- @@ -43,13 +43,13 @@ <a id="kofi" href="https://ko-fi.com/raysan" target="_blank"></a> <a id="itchio" href="https://raysan5.itch.io" target="_blank"></a> <a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a> - <a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a> + <a id="patreon" href="https://www.patreon.com/raylib" target="_blank"></a> <a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a> <a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a> - <a id="freenode" href="http://webchat.freenode.net/?channels=#raylib" target="_blank"></a> <a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a> <a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a> <a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a> + <a id="gitter" href="https://gitter.im/raylib" target="_blank"></a> <a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a> </div> <div class="menu"> diff --git a/helpme.html b/helpme.html index 022cb65..6300c57 100644 --- a/helpme.html +++ b/helpme.html @@ -34,13 +34,13 @@ <a id="kofi" href="https://ko-fi.com/raysan" target="_blank"></a> <a id="itchio" href="https://raysan5.itch.io" target="_blank"></a> <a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a> - <a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a> + <a id="patreon" href="https://www.patreon.com/raylib" target="_blank"></a> <a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a> <a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a> - <a id="freenode" href="http://webchat.freenode.net/?channels=#raylib" target="_blank"></a> <a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a> <a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a> <a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a> + <a id="gitter" href="https://gitter.im/raylib" target="_blank"></a> <a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a> </div> <div class="menu"> diff --git a/images/become_patron.png b/images/become_patron.png Binary files differnew file mode 100644 index 0000000..090b556 --- /dev/null +++ b/images/become_patron.png @@ -62,13 +62,13 @@ <a id="kofi" href="https://ko-fi.com/raysan" target="_blank"></a> <a id="itchio" href="https://raysan5.itch.io" target="_blank"></a> <a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a> - <a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a> + <a id="patreon" href="https://www.patreon.com/raylib" target="_blank"></a> <a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a> <a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a> - <a id="freenode" href="http://webchat.freenode.net/?channels=#raylib" target="_blank"></a> <a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a> <a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a> <a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a> + <a id="gitter" href="https://gitter.im/raylib" target="_blank"></a> <a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a> </div> <div class="menu"> @@ -116,27 +116,6 @@ <p>Wanna see all functions available in raylib? <a class="simplelink" href="cheatsheet/cheatsheet.html">CHECK CHEATSHEET</a></p> <p>raylib is open-source and free to use. <a class="simplelink" href="license.html" target="_self">View license</a>.</p> <br> - <strong>raylib supporters on patreon</strong> - <p>The following people have supported raylib project on <a class="simplelink" href="https://www.patreon.com/raysan5" target="_blank">patreon</a>. Many thanks to all of them for believing in the project and contributing to it.</p> - <br> - <p> - Jarrod - 2drealms (<a class="simplelink" href="https://twitter.com/2drealms" target="_blank">@2drealms</a>)</p> - <p> - Kovay Hatfield</p> - <p> - Pau Fernandez (<a class="simplelink" href="https://twitter.com/pauek" target="_blank">@pauek</a>)</p> - <p> - Chris Johnson</p> - <p> - Joel Davis (<a class="simplelink" href="https://twitter.com/joeld42" target="_blank">@joeld42</a>)</p> - <p> - Charles Nicosia</p> - <p> - Rajasekaran Senthil (<a class="simplelink" href="https://twitter.com/rskgames" target="_blank">@rskgames</a>)</p> - <p> - Adrian Guerrero</p> - <p> - Dani Gómez</p> - <p> - Justin Hamilton</p> - <p> - Antonio Radovcic</p> - <p> - Evan Sirchuk</p> - <p> - Justin Loudermilk</p> - <p> - Tazd'ij (<a class="simplelink" href="https://twitter.com/tazdij" target="_blank">@tazdij</a>)</p> - <p> - James W.Bohnke</p> - <p> - SungTae Kwon</p> - <br> - <p>And a very special thanks to <strong>Ilya Zarembsky</strong> (<a class="simplelink" href="https://twitter.com/wly_cdgr" target="_blank">@wly_cdgr</a>) for his generous contribution. Many thanks Ilya!</p> </div> <div class="footer"> diff --git a/license.html b/license.html index ad75de1..4ada88e 100644 --- a/license.html +++ b/license.html @@ -34,13 +34,13 @@ <a id="kofi" href="https://ko-fi.com/raysan" target="_blank"></a> <a id="itchio" href="https://raysan5.itch.io" target="_blank"></a> <a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a> - <a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a> + <a id="patreon" href="https://www.patreon.com/raylib" target="_blank"></a> <a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a> <a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a> - <a id="freenode" href="http://webchat.freenode.net/?channels=#raylib" target="_blank"></a> <a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a> <a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a> <a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a> + <a id="gitter" href="https://gitter.im/raylib" target="_blank"></a> <a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a> </div> <div class="menu"> |
