Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
20255 commits 75 branches 59 tags 1.2 GiB
Commit graph

1597 commits

Author SHA1 Message Date
Ryan Huffman
50bbeae30b Disable camera tool temporarily 2014-12-31 15:40:11 -08:00
Ryan Huffman
cf798e0a2f Fix orbit camera capturing mouse 2014-12-30 15:30:25 -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
a0cb40597b Remove gridControls.html 2014-12-30 11:31:47 -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
Ryan Huffman
a474243f08 Update to ignore mouseRelease events if mousePress event handles by tool 2014-12-30 11:21:50 -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
Andrew Meadows
3e087bd75e Merge pull request #3990 from ZappoMan/entityScriptsAndEvents 
Entity Scripts bug fixes/improvements
 2014-12-19 16:02:00 -08:00
Ryan Huffman
7249a7e299 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-12-19 15:27:33 -08:00
Ryan Huffman
588d7e62f4 Update camera-controls.svg url 2014-12-19 15:18:26 -08:00
Ryan Huffman
30e2a9c13f Add notifications.js to defaultScripts 2014-12-19 14:18:44 -08:00
Ryan Huffman
eaad95c949 Merge pull request #3985 from Adrianl3d/20221 
changes as per list
 2014-12-19 11:36:52 -08:00
ZappoMan
32ea38b938 added leaveAllEntities support 2014-12-19 11:33:25 -08:00
ZappoMan
97d617bd17 revert some prototype script stuff for now 2014-12-19 11:01:35 -08:00
ZappoMan
d43ec2ee28 revert some prototype script stuff for now 2014-12-19 11:00:41 -08:00
Ryan Huffman
2e96bbe38b Merge branch 'master' of github.com:highfidelity/hifi into camera-display 2014-12-19 10:37:47 -08:00
Ryan Huffman
15389b5fce Add camera UI to camera tool 2014-12-19 10:37:21 -08:00
ZappoMan
cfa5e5c61b Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-19 10:35:18 -08:00
Adrianl3d
51121554e5 clean up code 
intentations lines 263 264
 2014-12-20 04:28:39 +10:00
Brad Hefta-Gaub
821cbe610c Merge pull request #3975 from ctrlaltdavid/20212 
CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion
 2014-12-19 09:55:45 -08:00
Ryan Huffman
93aaa38c4c Add camera orientation overlay 2014-12-19 09:03:04 -08:00
Ryan Huffman
5b89208068 Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/overlays/Cube3DOverlay.cpp
 2014-12-18 16:46:17 -08:00
Ryan Huffman
1776b2dee2 Update line3d in editModels to use start instead of position 2014-12-18 16:41:41 -08:00
Ryan Huffman
5537fb970b Update scripts to use instead of for line3d 2014-12-18 16:23:24 -08:00
Adrianl3d
af1591277c changes as per list 
removed dummy code, remove mic mute state at startup, some text changes.
 2014-12-19 04:17:36 +10:00
Ryan Huffman
cb7f5a5b45 Roll gridTool.js back temporarily 2014-12-17 12:41:58 -08:00
Brad Hefta-Gaub
61ec1bdd6a Merge pull request #3977 from huffman/fix-minor-grid 
Fix minor grid spacing not updating
 2014-12-17 09:13:32 -08:00
Ryan Huffman
b95eac759e Fix minor grid spacing not updating 2014-12-17 08:52:48 -08:00
ZappoMan
85c8951734 really remove the debug settings from Model rendering 2014-12-16 13:57:22 -08:00
Ryan Huffman
a9223f5887 Remove text from label 2014-12-12 15:45:31 -08:00
Ryan Huffman
2fab404f7f Reorganize selectionManager selection checking 2014-12-12 15:35:39 -08:00
Ryan Huffman
dde9b92dbd Update SelectionManager -> selectionManager 2014-12-12 15:31:54 -08:00
Ryan Huffman
33b4c614ea Add buttons for moving selection to grid and resetting to natural dimensions 2014-12-12 15:28:57 -08:00
Ryan Huffman
a5cbc9b3e2 Fix properties window to work with undo/redo 2014-12-12 15:28:22 -08:00
Ryan Huffman
1a90a81037 Add id to properties window 2014-12-12 15:27:56 -08:00
Ryan Huffman
d1f5bf2e3c Add rotation to properties window 2014-12-12 15:27:30 -08:00
Ryan Huffman
b8737ad525 Update 'f' focus to only work when something is selected 2014-12-12 15:26:07 -08:00
David Rowe
1ab9129616 Update laserPointer.js to detect pointing with Leap Motion or similar 2014-12-11 21:31:23 -08:00
Brad Hefta-Gaub
31cbd6e88c Merge pull request #3954 from ctrlaltdavid/20226 
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
 2014-12-11 14:33:24 -08:00
Atlante45
b7d9023645 Don't stop defaultScripts 2014-12-11 12:06:24 -08:00
Stephen Birarda
76cf122d74 Merge pull request #3950 from birarda/master 
use higher resolution images in lobby
 2014-12-11 11:24:19 -08:00
Stephen Birarda
230b8740bf add higher resolution images to lobby 2014-12-11 11:23:27 -08:00