James B. Pollack
811fd0cec7
prep for meeting
2015-11-03 10:42:15 -08:00
James B. Pollack
aeac31cf6a
dont delete cubes by default
2015-11-02 16:37:24 -08:00
James B. Pollack
15af28337b
add color busters game for testing
2015-11-02 16:02:30 -08:00
James B. Pollack
e79ebdb8aa
cleanup syntax
2015-11-01 19:47:13 -08:00
James B. Pollack
459b449a7f
rename folder
2015-10-30 20:52:19 -07:00
James B. Pollack
0a083c070f
color busters cooperative game
2015-10-30 20:21:53 -07:00
Howard Stearns
2a16b56cba
Merge pull request #6253 from hyperlogic/tony/avatar-manager-real-fix
...
Crash fix for AvatarManager when iterating over _avatarHash
2015-10-30 16:32:34 -07:00
Anthony J. Thibault
085282db4f
Crash fix for AvatarManager when iterating over _avatarHash
...
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID(). When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d ) will *insert*
an empty smart_ptr into the hash.
2015-10-30 16:13:04 -07:00
samcake
710b51fe14
Merge pull request #6251 from ZappoMan/master
...
more tweaking of keyboard input routes
2015-10-30 15:34:51 -07:00
Brad Hefta-Gaub
22324eb281
more tweaking of keyboard input routes
2015-10-30 14:55:33 -07:00
Brad Hefta-Gaub
ec92c4e12f
Merge pull request #6248 from ZappoMan/master
...
fix json
2015-10-30 13:17:23 -07:00
Brad Hefta-Gaub
ce7fed2292
fix json
2015-10-30 13:16:31 -07:00
Brad Hefta-Gaub
8839458d54
Merge pull request #6242 from highfidelity/controllers
...
New Controller interfaces/api
2015-10-30 12:47:51 -07:00
Brad Hefta-Gaub
56e10552c5
Merge pull request #6246 from samcake/color-bis
...
Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version
2015-10-30 11:46:31 -07:00
samcake
393f6a4c76
Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version
2015-10-30 11:35:50 -07:00
Brad Hefta-Gaub
b5fd3424b8
Merge pull request #6245 from EdgarPironti/controllers
...
Fixed controllerExample.js parse error
2015-10-30 11:10:08 -07:00
EdgarPironti
f887bbd45c
Fixed controllerExample parse error
2015-10-30 11:06:20 -07:00
Anthony Thibault
fcfb44207f
Merge pull request #6097 from howard-stearns/expose-anim-vars
...
Expose animation vars to Javascript
2015-10-30 10:50:42 -07:00
Brad Davis
2518ada26f
Merge pull request #6220 from sethalves/new-smi-runtime
...
update cmake to work with newer smi runtime
2015-10-30 10:40:04 -07:00
Brad Hefta-Gaub
b2f27054f4
Merge pull request #6239 from AlessandroSigna/controllers
...
ViveController - input mapping
2015-10-30 10:39:26 -07:00
Brad Hefta-Gaub
80d3d848a2
Merge pull request #6243 from jherico/controllers
...
Fixing input plugin dependencies
2015-10-30 10:38:51 -07:00
Brad Davis
9607812116
Fixing input plugin dependencies
2015-10-30 10:18:51 -07:00
Brad Davis
49e7d42c2c
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-30 10:07:40 -07:00
Clément Brisset
a37c94bd3c
Merge pull request #6202 from birarda/asset-parenting
...
don't force parenting of AssetUpload/AssetRequest
2015-10-30 09:45:42 -07:00
Brad Hefta-Gaub
126f68114b
Merge pull request #6241 from huffman/fix-physics-substep-warning
...
Fix warning in ThreadSafeDynamicsWorld
2015-10-30 09:37:55 -07:00
Ryan Huffman
84869c512b
Fix mis-renamed method names
2015-10-30 09:30:22 -07:00
Andrew Meadows
cb8b8e194c
Merge pull request #6240 from ZappoMan/fixWarnings
...
fix some warnings and tweak cmake to have better name for disabled external dependency
2015-10-30 09:25:45 -07:00
Ryan Huffman
7a4787a79c
Rename stepSimulation to stepSimulationWithSubstepCallback to fix warning
2015-10-30 09:21:13 -07:00
Brad Hefta-Gaub
fb3bf16391
improvement to cmake to explicitly use local external dependency
2015-10-30 09:01:42 -07:00
Brad Hefta-Gaub
e12ddf86f6
add back optional externals
2015-10-30 08:33:29 -07:00
Brad Hefta-Gaub
43a4f1001d
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings
2015-10-30 08:30:02 -07:00
Brad Hefta-Gaub
b464b2f1f7
Merge pull request #6227 from jherico/externals
...
Moving SDL2, Sixense, and Faceshift to external projects
2015-10-30 01:13:45 -07:00
Brad Davis
fcfab0fc51
Moving SDL2, Sixense and Faceshift to external projects
2015-10-30 00:57:51 -07:00
Brad Hefta-Gaub
a149a2dd60
fix some warnings
2015-10-30 00:19:14 -07:00
Brad Davis
5233577d24
Merge pull request #6237 from ZappoMan/comfortTweaks
...
add makeAxis support to JSON parsing
2015-10-29 22:46:34 -07:00
Brad Davis
d9c534f404
Merge pull request #6236 from thoys/js-vec3-fixes
...
Scripting - Fix Vec3 properties and added multiplyVbyV function
2015-10-29 22:45:25 -07:00
Brad Hefta-Gaub
70f3156328
make sure CompositeEndpoints properly report readability more axis based keyboard inputs
2015-10-29 22:37:12 -07:00
Brad Hefta-Gaub
8a03383adc
use makeAxis for some keyboard support
2015-10-29 22:19:33 -07:00
Howard Stearns
96900dab25
Merge pull request #6195 from CrackerHax/master
...
Added AvatarList features for creating userlists in AC scripts
2015-10-29 22:11:57 -07:00
Howard Stearns
eb9e54de41
Make AnimVariantXXX.xxx consistent.
2015-10-29 19:45:23 -07:00
Howard Stearns
d491ddc3d6
comment.
2015-10-29 19:43:57 -07:00
Howard Stearns
1918f1835c
Tolerate AnimVars that are float when we want int, and vice versa.
2015-10-29 19:37:13 -07:00
Howard Stearns
f7d558a252
comment
2015-10-29 19:26:54 -07:00
Howard Stearns
dcc173c93a
comment.
2015-10-29 19:21:24 -07:00
Howard Stearns
5d1ba90f1e
More readable code.
2015-10-29 19:18:34 -07:00
Howard Stearns
ada32dd260
typo
2015-10-29 19:17:52 -07:00
AlessandroSigna
01d3805148
ViveController - mapping of buttons
2015-10-29 18:44:43 -07:00
Brad Hefta-Gaub
b56c49a182
add makeAxis support to JSON parsing
2015-10-29 17:33:30 -07:00
James B. Pollack
846310f9fb
Merge pull request #6208 from ericrius1/closePaintModel
...
Added to the whiteboard model, and some bug fixes
2015-10-29 17:05:20 -07:00
Thijs Wenker
35e03d662d
fix the constants of Vec3 , const glm::vec3& UNIT_***() weren't accessible in javascript. Solved it by making them properties that are CONSTANT. Also added function to multiply a vec3 by a vec3 called multiplyVbyV since overloading it over multiply gave me some problems
2015-10-30 00:58:32 +01:00
