Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 10:49:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20697 commits 25 branches 0 tags 1.1 GiB
Commit graph

20697 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
250a3de9fe make node mutex in LimitedNodeList recursive for double read lock 2015-01-15 13:34:33 -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
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
ZappoMan
ff60833129 fix ray pick of ellipsoids away from origin 2015-01-14 16:55:24 -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
Andrew Meadows
f90b128ac3 use density instead of mass in scripts/UI 2015-01-14 15:48:05 -08:00
Andrew Meadows
ccc50dd94f use density instead of mass 2015-01-14 15:47:44 -08:00
Atlante45
7b5babb02a Set AddressManager before NodeList 2015-01-14 15:46:33 -08:00
Andrew Meadows
03b8badd81 EntityItem stores density rather than mass. 2015-01-14 15:00:57 -08:00
Andrew Meadows
8236837dd0 add ShapeInfo::computeVolume() 2015-01-14 15:00:31 -08:00
Atlante45
1399de52a5 Only use limited nodelist in DS 2015-01-14 14:24:54 -08:00
Chris Collins
6ce71d9655 Fix library and placement reference 
Fix library reference and switch the gun hand.
 2015-01-14 13:54:34 -08:00
David Rowe
a78ab5a5b3 Teleport to selected bookmark 2015-01-14 10:14:56 -08:00
Ryan Huffman
e7eb12202a Fix rotation handles not showing up 2015-01-14 09:41:34 -08:00
David Rowe
01f7efe767 Remove ellipsis from Collide With menu item 
Noticed in passing.
 2015-01-13 22:48:05 -08:00
David Rowe
fa6faa771a Add bookmarks with Bookmark Location menu item 
The menu of bookmarks is kept sorted.
 2015-01-13 22:39:16 -08:00
Atlante45
48f1cbe644 Fixed QSharedPointer in connect() 2015-01-13 20:54:15 -08:00
Atlante45
476e2124b7 Moved DM::get() calls to auto 2015-01-13 20:51:02 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00