Eric Levin
|
7a12a4d58e
|
added support for both right and left hydras for hydra scripts, and made picking accurate
|
2015-05-14 17:00:40 -07:00 |
|
Philip Rosedale
|
363f55c0f1
|
Merge pull request #4872 from ericrius1/hydraHockey
added hydraHockeyGrab.js, which constrains moving object to xz plane …
|
2015-05-14 15:05:44 -07:00 |
|
Philip Rosedale
|
3ee7f30cf5
|
Merge pull request #4874 from AndrewMeadows/thermonuclear
add restitution and friction to entity properties
|
2015-05-14 14:01:27 -07:00 |
|
Andrew Meadows
|
53e241fb07
|
merge upstream/master into andrew/thermonuclear
|
2015-05-14 12:37:41 -07:00 |
|
Andrew Meadows
|
d28c400cea
|
add restitution and friction Entity properties
|
2015-05-14 12:36:59 -07:00 |
|
Eric Levin
|
ebb590e58a
|
added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script
|
2015-05-14 11:46:52 -07:00 |
|
Seth Alves
|
41d77e6146
|
Merge pull request #4852 from AndrewMeadows/nova
improved distributed simulation ownership negotiation
|
2015-05-14 11:40:49 -07:00 |
|
Eric Levin
|
3393b60aba
|
added hydraHockeyGrab.js, which constrains moving object to xz plane and disables rotation
|
2015-05-14 11:39:04 -07:00 |
|
Clément Brisset
|
a3dc7def7b
|
Merge pull request #4870 from sethalves/quiet-model-log-spam
don't allow buildModelMesh to spam logs when it encounters flawed models
|
2015-05-14 19:36:57 +02:00 |
|
Seth Alves
|
1e2e4001b1
|
don't allow buildModelMesh to spam logs when it encounters flawed models
|
2015-05-14 10:24:02 -07:00 |
|
Philip Rosedale
|
e0e026c639
|
Merge pull request #4862 from birarda/master
fixes for other avatar receive stats rendering
|
2015-05-14 10:19:09 -07:00 |
|
Andrew Meadows
|
81d06e0dc3
|
Merge upstream/master into andrew/nova
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
|
2015-05-14 10:09:55 -07:00 |
|
Seth Alves
|
5a0f0972da
|
Merge pull request #4867 from PhilipRosedale/hockeygame
first version, air hockey game
|
2015-05-14 09:18:42 -07:00 |
|
Brad Hefta-Gaub
|
d1f52231be
|
Merge pull request #4863 from samcake/orange
Using the skymap for ambient lighting
|
2015-05-14 09:12:46 -07:00 |
|
Brad Hefta-Gaub
|
979a6fb682
|
Merge pull request #4868 from jherico/web
Make web entities responsive to mouse
|
2015-05-14 09:12:12 -07:00 |
|
Andrew Meadows
|
c631f85bf9
|
cleanup of simulation ownership/update logic
|
2015-05-14 08:43:54 -07:00 |
|
Brad Davis
|
a77816617d
|
Make web entities interactive (via the mouse) if they're not locked.
|
2015-05-14 01:15:20 -07:00 |
|
Philip Rosedale
|
1e01aeb9ed
|
first version, air hockey game
|
2015-05-13 23:11:24 -07:00 |
|
Seth Alves
|
baf4157da0
|
Merge pull request #4859 from ZappoMan/typeSafePropertyCleanup
Clean up Entity Properties and Macros to be more type-safe friendly and consistent
|
2015-05-13 20:52:03 -07:00 |
|
Brad Hefta-Gaub
|
99cd3989c6
|
Merge pull request #4865 from sethalves/fix-ray-intersection
sam's mesh code
|
2015-05-13 20:46:05 -07:00 |
|
Brad Hefta-Gaub
|
b799b89dbc
|
Merge pull request #4861 from thoys/20540
CR for Job #20540 - Additions to Planky
|
2015-05-13 20:40:58 -07:00 |
|
Brad Hefta-Gaub
|
77019eafa7
|
Merge pull request #4831 from jherico/plugins_pt2
Display plugins part 2
|
2015-05-13 20:40:33 -07:00 |
|
ZappoMan
|
0dcb89fce7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
|
2015-05-13 20:33:10 -07:00 |
|
Brad Hefta-Gaub
|
5da0a8d7a3
|
Merge pull request #4860 from howard-stearns/entity-sound
Entity sound.
|
2015-05-13 20:07:44 -07:00 |
|
Philip Rosedale
|
4811697de3
|
Merge pull request #4866 from sethalves/fix-grab.js-entity-picking
have grab.js do *accurate* picking!
|
2015-05-13 19:52:09 -07:00 |
|
Seth Alves
|
098158870a
|
Merge pull request #4864 from ctrlaltdavid/build-warnings
Fix some double/float mismatch build warnings on Windows
|
2015-05-13 19:43:05 -07:00 |
|
Seth Alves
|
73fa1af24a
|
have grab.js do *accurate* picking!
|
2015-05-13 19:38:19 -07:00 |
|
Seth Alves
|
9a8ece8980
|
nm fix that in another branch
|
2015-05-13 19:36:11 -07:00 |
|
Seth Alves
|
3b2b068ac9
|
fix entity selection in grab.js
|
2015-05-13 19:35:03 -07:00 |
|
ZappoMan
|
c1b4e3bbb7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
|
2015-05-13 18:30:01 -07:00 |
|
Seth Alves
|
9935b2ba22
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-ray-intersection
|
2015-05-13 18:17:07 -07:00 |
|
Howard Stearns
|
b79a58c0c8
|
Whitespace.
|
2015-05-13 18:07:51 -07:00 |
|
Stephen Birarda
|
e9a2cbdc9a
|
handle falsy values for valueForKeyPath
|
2015-05-13 17:49:54 -07:00 |
|
Brad Hefta-Gaub
|
072a982fe3
|
Merge pull request #4851 from huffman/fix-edit-properties-width
Remove nowrap from entity tool property labels
|
2015-05-13 17:45:57 -07:00 |
|
David Rowe
|
2032d36b1f
|
Fix double/float mismatch build warnings
|
2015-05-13 17:32:40 -07:00 |
|
ZappoMan
|
045c0141e8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
|
2015-05-13 17:09:21 -07:00 |
|
Brad Hefta-Gaub
|
3b7acae8a2
|
Merge pull request #4850 from jherico/web-entity
Web entity
|
2015-05-13 17:02:55 -07:00 |
|
Sam Cake
|
d13106f4c9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-05-13 16:00:42 -07:00 |
|
Sam Cake
|
238d3751c5
|
cleaning up the SH generation
|
2015-05-13 16:00:05 -07:00 |
|
Howard Stearns
|
ef187b390b
|
Server versioning.
|
2015-05-13 15:52:05 -07:00 |
|
Howard Stearns
|
dc2e923583
|
Ordering for packets.
|
2015-05-13 15:51:11 -07:00 |
|
Howard Stearns
|
8324da2f7f
|
Whitespace formatting/indentation.
|
2015-05-13 15:48:22 -07:00 |
|
Howard Stearns
|
6ebeb7a22e
|
Another constexpr.
|
2015-05-13 15:47:47 -07:00 |
|
Seth Alves
|
0db5ddc5b7
|
port code from samcake's model branch
|
2015-05-13 15:43:16 -07:00 |
|
Philip Rosedale
|
0a65c06e2b
|
Merge pull request #4857 from sethalves/smaller-collision-margins
Smaller collision margins
|
2015-05-13 15:22:45 -07:00 |
|
Stephen Birarda
|
57fa3d8c53
|
fixes for other avatar receive stats rendering
|
2015-05-13 14:43:31 -07:00 |
|
Philip Rosedale
|
28643b8145
|
Merge pull request #4858 from birarda/domain-paths
handle fail case in DS updateSetting
|
2015-05-13 14:28:27 -07:00 |
|
Stephen Birarda
|
225b41d163
|
don't do dumb things with memory
|
2015-05-13 14:18:48 -07:00 |
|
Brad Davis
|
3b7e8a69b5
|
Attempting to fix threading issues with web entities
|
2015-05-13 14:00:41 -07:00 |
|
Seth Alves
|
3f8f5fd82e
|
Merge branch 'master' of github.com:highfidelity/hifi into smaller-collision-margins
|
2015-05-13 13:56:29 -07:00 |
|