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

206 commits

Author SHA1 Message Date
Ryan Huffman
0e28f66906 Fix rotation of selection shadow for editEntities 2015-02-04 13:45:06 -08:00
Ryan Huffman
3af025574f Decrease distance from object when focusing 2015-02-04 10:45:24 -08:00
Ryan Huffman
02d828443b Update zoom sensitivity when using keys 2015-02-04 10:44:54 -08:00
Ryan Huffman
77c78689d1 Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on 2015-01-30 09:28:09 -08:00
Ryan Huffman
018a4af9d6 Update camera tool to wrap cursor to window bounds rather than keep at center 2015-01-30 09:22:39 -08:00
Ryan Huffman
d06d8b8f01 Merge branch 'master' of github.com:highfidelity/hifi into revert-grid 
Conflicts:
	examples/libraries/gridTool.js
 2015-01-29 17:27:58 -08:00
Ryan Huffman
7017fdbac0 Update style of grid tools 2015-01-29 16:59:58 -08:00
Ryan Huffman
3447fea1db Revert "Update grid tool to be an overlay" 
This reverts commit 552a421f24.

Conflicts:
	examples/libraries/gridTool.js
 2015-01-28 16:01:04 -08:00
Ryan Huffman
1b81ee17ab Update how orbit-by-key is appleid 2015-01-28 12:23:58 -08:00
Ryan Huffman
09af7ed10f Remove extra print statement 2015-01-28 12:21:58 -08:00
Ryan Huffman
55f41eb452 Update gridTool to not use clone 2015-01-28 12:20:08 -08:00
Ryan Huffman
5633be0e92 Add ability to move orbit camera using keys 2015-01-28 12:19:42 -08:00
Ryan Huffman
80002551f9 Update editEntities camera to not enable if camera is in independent mode 2015-01-27 11:28:39 -08:00
Ryan Huffman
bc21faeefb Add entityListTool.toggleVisible 2015-01-20 12:41:58 -08:00
Ryan Huffman
92b99237a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-15 11:13:01 -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
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
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
Ryan Huffman
e7eb12202a Fix rotation handles not showing up 2015-01-14 09:41:34 -08:00
Ryan Huffman
9e8458edd9 Add support for teleport, delete, and filtering in entity list 2015-01-13 15:35:30 -08:00
Ryan Huffman
0c58572d32 Reduce size of camera tool cubes 2015-01-13 08:45:11 -08:00
Ryan Huffman
e873df9680 Remove mode buttons from camera tool and increase size 2015-01-13 08:39:59 -08:00
Ryan Huffman
aad49e4404 Update camera tool to only show when edit entities is enabled 2015-01-13 08:26:32 -08:00
Ryan Huffman
80351a768e Enable camera tool 2015-01-13 08:26:11 -08:00
Ryan Huffman
eafe1ae951 Update position of grid-to-avatar to be at the left foot 2015-01-07 12:15:36 -08:00
Chris Collins
0a1a64b7e6 Script updates and fixes to highfidelity-public 
Script updates and fixes to highfidelity-public
 2015-01-06 17:04:42 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Brad Hefta-Gaub
58a2a5eb83 Merge pull request #4027 from huffman/grid-shader-updates 
Grid shader updates
 2015-01-05 13:00:05 -08:00
Ryan Huffman
50bbeae30b Disable camera tool temporarily 2014-12-31 15:40:11 -08:00
Ryan Huffman
a8de290482 Update grid alpha 2014-12-31 11:12:02 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
48285b21c4 remove voxel related scripts 2014-12-30 20:50:07 -08:00
Ryan Huffman
0105906dc7 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	examples/editEntities.js
 2014-12-30 15:02:59 -08:00
Ryan Huffman
2b835e621c Rename 2D -> HUD, 3D -> World in Overlays 2014-12-30 14:50:17 -08:00
Ryan Huffman
ea69dcaf29 Update grid colors 2014-12-30 13:10:23 -08:00
Clément Brisset
ecdf415954 Merge pull request #4016 from huffman/grid-tools-overlay 
Grid tools overlay
 2014-12-30 12:18:13 -08:00
Ryan Huffman
1da253d39f Remove duplicate minorGridWidth variable 2014-12-30 12:13:40 -08:00
Ryan Huffman
16bf4e87e6 Remove unused function 2014-12-30 11:34:59 -08:00
Ryan Huffman
552a421f24 Update grid tool to be an overlay 2014-12-30 11:31:29 -08:00
Ryan Huffman
fbd189bde3 Rename minorGridSpacing to minorGridWidth 2014-12-30 11:28:10 -08:00
Ryan Huffman
fdba41a69d Add grid colors to Grid 2014-12-30 11:27:16 -08:00
Ryan Huffman
9a6bce3767 Add getters/setters to Grid 2014-12-30 11:26:44 -08:00
Chris Collins
e105ba61e8 Fix for model uploading to work 
Fix for model uploading to work. The deleted elements were causing an
error when trying to upload models.
 2014-12-23 11:01:25 -08:00
Ryan Huffman
588d7e62f4 Update camera-controls.svg url 2014-12-19 15:18:26 -08:00
Ryan Huffman
15389b5fce Add camera UI to camera tool 2014-12-19 10:37:21 -08:00
Ryan Huffman
93aaa38c4c Add camera orientation overlay 2014-12-19 09:03:04 -08:00
Ryan Huffman
cb7f5a5b45 Roll gridTool.js back temporarily 2014-12-17 12:41:58 -08:00
Ryan Huffman
b95eac759e Fix minor grid spacing not updating 2014-12-17 08:52:48 -08:00
Stephen Birarda
55ec455f77 Merge pull request #3928 from huffman/entity-tool-settings 
Entity tool settings
 2014-12-09 12:14:17 -08:00