Stephen Birarda
|
336f28e014
|
repair to places array length
|
2015-01-15 15:00:42 -08:00 |
|
Stephen Birarda
|
00f4e92e06
|
fix places array grab
|
2015-01-15 14:58:49 -08:00 |
|
Stephen Birarda
|
6f5d9d54ec
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-01-15 14:15:38 -08:00 |
|
Stephen Birarda
|
b2c5847d9b
|
Merge pull request #4117 from Atlante45/dm_update
Drop DM ref before creating new object
|
2015-01-15 14:15:01 -08:00 |
|
Atlante45
|
786c0a5462
|
Drop DM ref before creating new object
|
2015-01-15 14:00:45 -08:00 |
|
Brad Hefta-Gaub
|
a2aad615a0
|
Merge pull request #4114 from birarda/avatar-mixer-lock
potential fix for avatar-mixer deadlock
|
2015-01-15 13:49:22 -08:00 |
|
Stephen Birarda
|
250a3de9fe
|
make node mutex in LimitedNodeList recursive for double read lock
|
2015-01-15 13:34:33 -08:00 |
|
Stephen Birarda
|
93c3b2fb74
|
repairs for new DependencyManager format
|
2015-01-15 13:14:26 -08:00 |
|
Stephen Birarda
|
e538669343
|
resolve conflicts on merge with upstream
|
2015-01-15 13:12:05 -08:00 |
|
Stephen Birarda
|
eef5807fb4
|
Merge pull request #4109 from ctrlaltdavid/20269
CR for Job #20269 - Add option to copy address and path to menu
|
2015-01-15 11:32:51 -08:00 |
|
Brad Hefta-Gaub
|
d5d4b4ee18
|
Merge pull request #4113 from huffman/edit-entity-click
Update editEntities to do an accurate pick when the mouse is idle
|
2015-01-15 11:04:34 -08:00 |
|
Brad Hefta-Gaub
|
fbc040759e
|
Merge pull request #4112 from cozza13/20270
CR for Job #20270 - Change reference of global.js
|
2015-01-15 11:03:52 -08:00 |
|
Brad Hefta-Gaub
|
28c0cb0c3e
|
Merge pull request #4110 from huffman/update-properties-layout
Update properties layout
|
2015-01-15 11:03:21 -08:00 |
|
David Rowe
|
5195ae2424
|
Merge branch 'master' into 20269
|
2015-01-15 11:01:17 -08:00 |
|
Ryan Huffman
|
bf6d63cf0c
|
Make accurateRay parameter required
|
2015-01-15 10:59:24 -08:00 |
|
Ryan Huffman
|
dcb4d9f02d
|
Update editEntities to do accurate pick on mouse idle
|
2015-01-15 10:57:35 -08:00 |
|
Ryan Huffman
|
1b9b7b6797
|
Merge branch 'master' of github.com:highfidelity/hifi into update-properties-layout
Conflicts:
examples/html/entityProperties.html
|
2015-01-15 10:53:07 -08:00 |
|
Chris Collins
|
d6a3b94c73
|
Changed references of global.js to a var
Changed references of global.js to a var
|
2015-01-15 10:48:31 -08:00 |
|
David Rowe
|
91e321565a
|
Change menu item text
|
2015-01-15 10:38:17 -08:00 |
|
Philip Rosedale
|
048d190350
|
Merge pull request #4108 from ctrlaltdavid/20263
CR for Job #20263 - Create a "Bookmarks" capability
|
2015-01-15 10:30:41 -08:00 |
|
Ryan Huffman
|
dbb978e278
|
Update style and layout of entity properties window
|
2015-01-15 10:22:39 -08:00 |
|
Philip Rosedale
|
67c3f9a3db
|
Merge pull request #4107 from huffman/fix-update-my-avatar
Fix issue with avatar data being sent too often
|
2015-01-15 10:22:18 -08:00 |
|
David Rowe
|
52876ecb16
|
Fix merge
|
2015-01-15 10:07:51 -08:00 |
|
Brad Hefta-Gaub
|
e8114794bc
|
Merge pull request #3981 from thoys/20216
CR for Job #20216 - Integrate the Intel Realsense camera SDK
|
2015-01-15 10:04:51 -08:00 |
|
David Rowe
|
95efe9857b
|
Merge branch 'master' into 20263
|
2015-01-15 09:52:19 -08:00 |
|
Ryan Huffman
|
00487fb175
|
Fix issue with avatar data being sent too often
|
2015-01-15 09:45:51 -08:00 |
|
Stephen Birarda
|
8455258fd4
|
update BUILD_WIN.md to support VS2013 Express
|
2015-01-15 09:44:02 -08:00 |
|
David Rowe
|
544d412122
|
Add menu items that copy location address and location path
And Rename File > Go to File > Location
|
2015-01-15 09:33:35 -08:00 |
|
David Rowe
|
ebe80075dc
|
Tidy
|
2015-01-14 23:20:47 -08:00 |
|
David Rowe
|
426cd71fc6
|
Persist bookmarks to file
|
2015-01-14 22:58:13 -08:00 |
|
David Rowe
|
d9bd7f019f
|
Simplify bookmark handling
|
2015-01-14 22:20:45 -08:00 |
|
David Rowe
|
1ffe22d5e9
|
Sanitize bookmark names
|
2015-01-14 18:31:54 -08:00 |
|
Stephen Birarda
|
79d214619d
|
update lobby for new places API
|
2015-01-14 18:18:26 -08:00 |
|
David Rowe
|
da58d5a381
|
Delete Bookmark menu item and dialog box
|
2015-01-14 18:15:39 -08:00 |
|
Thijs Wenker
|
8ffea45736
|
QFileDialog include
|
2015-01-15 02:59:37 +01:00 |
|
Thijs Wenker
|
80a81043ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20216
Conflicts:
interface/src/Menu.cpp
|
2015-01-15 02:28:31 +01:00 |
|
Brad Hefta-Gaub
|
89967fbe7a
|
Merge pull request #4104 from AndrewMeadows/inertia
store density in EntityItem instead of mass
|
2015-01-14 17:17:45 -08:00 |
|
Brad Hefta-Gaub
|
9d45bed0e2
|
Merge pull request #4103 from Atlante45/applications_diet_cpp11
DependencyManager update
|
2015-01-14 17:17:07 -08:00 |
|
Philip Rosedale
|
1188be52e4
|
Merge pull request #4106 from ZappoMan/rayPickWork
fix ray pick of ellipsoids away from origin
|
2015-01-14 17:10:30 -08:00 |
|
Philip Rosedale
|
627689f587
|
Merge pull request #4105 from Atlante45/body_not_rotating
Fixes body not rotating for other avatars
|
2015-01-14 17:07:44 -08:00 |
|
Stephen Birarda
|
ef87b59a0c
|
remove method declarations for location changes
|
2015-01-14 17:02:18 -08:00 |
|
Stephen Birarda
|
69869a696b
|
remove name this location call from application
|
2015-01-14 17:00:21 -08:00 |
|
Stephen Birarda
|
e5fe24e088
|
remove My Locations and Name This Location
|
2015-01-14 16:58:15 -08:00 |
|
Stephen Birarda
|
b8b5b2b6ec
|
don't check the root object for path
|
2015-01-14 16:56:49 -08:00 |
|
ZappoMan
|
ff60833129
|
fix ray pick of ellipsoids away from origin
|
2015-01-14 16:55:24 -08:00 |
|
Stephen Birarda
|
f745dfdb91
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-01-14 16:54:51 -08:00 |
|
Atlante45
|
b922b028e9
|
Fixes body not rotating for other avatars
|
2015-01-14 16:47:20 -08:00 |
|
Philip Rosedale
|
fead12acca
|
Merge pull request #4102 from cozza13/20268
CR for Job #20268 - Change hands for gun scripts
|
2015-01-14 15:52:04 -08:00 |
|
Ryan Huffman
|
10f8e54903
|
Update style of properties windows
|
2015-01-14 15:50:42 -08:00 |
|
Clément Brisset
|
ce12e61a27
|
Merge pull request #4101 from huffman/fix-rotation-image
Fix rotation handles not showing up
|
2015-01-14 15:49:09 -08:00 |
|