Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 15:57:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21017 commits 74 branches 59 tags 1.2 GiB
Commit graph

1690 commits

Author SHA1 Message Date
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
Thijs Wenker
e913095af5 Merge branch 'master' of https://github.com/worklist/hifi into 20216 
Conflicts:
	interface/CMakeLists.txt
 2014-12-19 13:53:33 +01: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
Thijs Wenker
99b0cca8f3 realsenseHands.js example 2014-12-18 00:08:20 +01: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
AndrewMeadows
bb6f976699 Merge pull request #3945 from ZappoMan/someCleanup 
AudioRefector-ectomy
 2014-12-11 10:39:41 -08:00
Brad Hefta-Gaub
cfe0b28504 Merge pull request #3948 from huffman/lobby-black-panels 
Update lobby to use new URLs + black panels in place of H
 2014-12-10 20:16:22 -08:00
Ryan Huffman
0c746168ef Update lobby to use new URLs + black panels in place of H 2014-12-10 19:48:05 -08:00
Brad Hefta-Gaub
de5702157b Merge pull request #3946 from Atlante45/lobby_in_default 
Lobby in defaultScripts
 2014-12-10 17:27:14 -08:00
Atlante45
ccf8d0a787 DefaultScript.js doesn't appear in running scripts 2014-12-10 16:55:40 -08:00
Atlante45
ff372c5f4e Added lobby.js to default scripts 2014-12-10 16:53:21 -08:00
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Ryan Huffman
9c9bfeed33 Add missing 'var' to local variable 2014-12-10 14:27:37 -08:00
Ryan Huffman
961f629074 Fix indentation, 4 -> 2 2014-12-10 14:26:42 -08:00
Ryan Huffman
7515c26d71 Merge remote-tracking branch 'upstream/master' into lobby-reorder 2014-12-10 14:17:47 -08:00
Ryan Huffman
a24acb4858 Fix style 2014-12-10 14:15:43 -08:00
Ryan Huffman
6fa1d7a7bd Update lobby to start on the second row 2014-12-10 14:08:59 -08:00
Atlante45
10a6428277 Chess board correct orientation 2014-12-10 10:37:54 -08:00
David Rowe
ff6db7a9fa Merge branch 'master' into 20226 2014-12-09 19:20:30 -08:00
David Rowe
3ea3a497c6 Update scripts to use new textSize() method 2014-12-09 18:33:29 -08:00
Brad Hefta-Gaub
69f7a89003 Merge pull request #3937 from Atlante45/mouse_pick_in_oculus 
Mouse pick improvments
 2014-12-09 18:33:25 -08:00
Brad Hefta-Gaub
9c1be46893 Merge pull request #3929 from huffman/new-entities-default 
New entities default
 2014-12-09 18:00:25 -08:00
AndrewMeadows
1697636db5 Merge pull request #3933 from ZappoMan/entityCollisions 
move emit of collisions to after done moving entities, so that callbacks can delete entities
 2014-12-09 17:46:41 -08:00
Philip Rosedale
756e1b4d63 Merge pull request #3935 from PhilipRosedale/master 
option to suppress lobby text for now, defaults to true
 2014-12-09 17:40:03 -08:00
Philip Rosedale
96c3a0edbd option to suppress lobby text for now, defaults to true 2014-12-09 17:39:05 -08:00
Atlante45
b197558b87 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 16:46:13 -08:00
Atlante45
0a4f74cf9c Single reticle in the lobby 2014-12-09 16:29:45 -08:00
Ryan Huffman
ec62c6833c Make editEntities a default script and remove editVoxels.js 2014-12-09 12:15:22 -08:00
Ryan Huffman
a63d0e7770 Rename newEditEntities.js to editEntities.js 2014-12-09 12:15:22 -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
ZappoMan
895e22fcdb removed debug code 2014-12-09 12:12:04 -08:00
ZappoMan
79fc8a5a71 remove debug ryans rotate problem 2014-12-09 11:58:01 -08:00
Ryan Huffman
19ba2a1f84 Remove print statement 2014-12-09 08:56:29 -08:00
Ryan Huffman
2696f71be9 Update edit entities to disable on wasd or arrow keys 2014-12-09 08:54:28 -08:00
Ryan Huffman
e5aee44ceb Add setting save/load to grid tool 2014-12-09 08:51:04 -08:00
ZappoMan
3c09ca71cb move emit of collisions to after done moving entities, so that callbacks can delete entities 2014-12-08 18:09:49 -08:00
Clément Brisset
db751ca0c4 Merge pull request #3924 from ZappoMan/entityCollisions 
make collision callbacks work as entity methods
 2014-12-08 16:47:25 -08:00
ZappoMan
0d636314ba fixed CR feedback 2014-12-08 16:20:39 -08:00
Brad Hefta-Gaub
39b1f73976 Merge pull request #3921 from Atlante45/tabs_to_spaces 
Tabs to spaces
 2014-12-08 15:55:05 -08:00
ZappoMan
7449821a9b add ID to the properties dialog box 2014-12-08 15:06:50 -08:00
ZappoMan
efbe8ce757 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions 2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06 make collision callbacks work 2014-12-08 14:15:03 -08:00
Ryan
7fffcd3b53 Swap out the lobby model for the one with the correct light value 2014-12-08 12:47:37 -08:00
Atlante45
716fca6ae7 tabs to spaces 2014-12-08 11:49:55 -08:00
Clément Brisset
681a1a3297 Merge pull request #3917 from ctrlaltdavid/20202 
CR for Job #20202 - Add "backgroundVisible" property to text overlays
 2014-12-08 11:43:52 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
ZappoMan
aefeda37bd more debugging 2014-12-08 09:41:58 -08:00
Philip Rosedale
732b40f68c Merge pull request #3918 from ZappoMan/acEntityCrash 
Ac entity crash
 2014-12-08 09:16:40 -08:00
ZappoMan
0f5930a43d add identifyEntity() to butterflies script 2014-12-08 06:50:28 -08:00
Philip Rosedale
60c2a89292 Merge pull request #3915 from ZappoMan/modelRayPick 
Proper Model Ray Picking
 2014-12-07 14:19:26 -08:00
Ryan Huffman
a53e1c69fd Merge pull request #3914 from thoys/20163 
CR for Job #20163 - Implement virtual keyboard for use in HMD
 2014-12-07 10:22:34 -08:00
ZappoMan
8dd1a2815f use precision picking in newEditEntities 2014-12-06 15:43:17 -08:00
ZappoMan
91fd574eb5 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-06 15:28:54 -08:00
Thijs Wenker
351819708b style fixes 2014-12-06 23:50:30 +01:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
David Rowe
dbb547507d Merge branch 'master' into 20202 2014-12-06 11:14:45 -08:00
David Rowe
ca62e61579 Update scripts with text overlays to use new backgroundAlpha property 2014-12-06 11:11:52 -08:00
David Rowe
4ee99ef38a Remove dead code that's causing problems 2014-12-06 11:03:28 -08:00
David Rowe
fd00ad95ca Fix voxel size text display 2014-12-06 09:24:30 -08:00
Brad Hefta-Gaub
2bf93bd9f0 Merge pull request #3913 from huffman/entity-tool-property-fixes 
Entity tool property fixes + add script property
 2014-12-06 00:40:18 -08:00
Thijs Wenker
ccdb13c951 virtualkeyboard: moved files to hifi public bucket 2014-12-06 00:33:33 +01:00
Ryan Huffman
a89411fd5e Add script URL to properties tool 2014-12-05 15:27:40 -08:00
Ryan Huffman
896a34212b Fix sections not properly updating in properties tool 2014-12-05 15:27:24 -08:00
Andrzej Kapolka
01c209ef07 Merge pull request #3912 from PhilipRosedale/master 
Add gamepad warp to headMove, remove step turning when head rotated
 2014-12-05 15:27:03 -08:00
Philip Rosedale
2c8b1721cc Add warp from right ('O') button on gamepad 2014-12-05 14:06:41 -08:00
ZappoMan
d5fbe5b6b4 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-05 12:48:00 -08:00
Brad Hefta-Gaub
a3fbaab957 Merge pull request #3911 from huffman/entity-tool-window-polish 
Entity Properties Tool Window Polish
 2014-12-05 12:38:43 -08:00
Brad Hefta-Gaub
1de7db390e Merge pull request #3908 from PhilipRosedale/master 
Orbiting sound example, ability to set injector position, better butterflies
 2014-12-05 12:37:42 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
David Rowe
f5a1c26492 Add backgroundAlpha property to 2D and 3D text overlays 2014-12-05 11:08:00 -08:00
Ryan Huffman
849397288e Update properties tool to be a resizable table 2014-12-05 10:46:35 -08:00
Ryan Huffman
0ece6c0968 Update properties window to show properties for locked entities 2014-12-05 10:43:15 -08:00
Philip Rosedale
bc609016a9 remove debug 2014-12-05 08:59:41 -08:00
Philip Rosedale
c5247ca65b Add ability to set injector properties during playing, and orbitingSound.js 2014-12-05 08:45:00 -08:00
Philip Rosedale
dbf64b2de7 Merge pull request #3898 from DaveDubUK/walk-JS-1.12 
Version 1.12 of the walk.js script
 2014-12-04 16:29:19 -08:00
Thijs Wenker
c0ba9e73c2 fixed font height bq 2014-12-05 01:07:49 +01:00
Philip Rosedale
47c2ea95f4 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-04 16:07:28 -08:00
Thijs Wenker
a7185738e9 virtualkeyboard: scaling text in input box 2014-12-05 00:52:36 +01:00
Clément Brisset
26340353ac Merge pull request #3897 from ZappoMan/rayPickWork 
Work on improving pickable entities - Lights Optionally pickable, Spheres & Text pick properly, other bug fixes
 2014-12-04 15:43:17 -08:00
Ryan Huffman
ba3f051c8c Disable the warp button in gamepad.js 2014-12-04 15:11:16 -08:00
Ryan Huffman
3bbee640fb Make gamepad mirror button toggle 2014-12-04 14:48:03 -08:00
Ryan Huffman
500b8a49d1 Add button to gamepad.js to toggle mirror mode 2014-12-04 14:17:24 -08:00
Ryan Huffman
e3a34f6db0 Add multi-speed control to gamepad.js 2014-12-04 12:17:31 -08:00
Thijs Wenker
5e2d1c3364 more comfortable movement setting 2014-12-04 21:15:10 +01:00
Brad Hefta-Gaub
3a396b3256 Merge pull request #3900 from huffman/entity-tools-fix-rp-rotation 
Fix entity tool rotation to rotate around registration point
 2014-12-04 11:41:22 -08:00
Ryan Huffman
1ee45e8bd1 Fix entity tool rotation to rotate around registration point 2014-12-04 11:24:56 -08:00
Brad Hefta-Gaub
cab1be25ed Merge pull request #3899 from huffman/entity-tools-fix-registration-point 
Entity tools fix registration point
 2014-12-04 11:04:27 -08:00
Ryan Huffman
1f82831bcc Fix call to getRelativeCenterPosition 2014-12-04 10:47:09 -08:00
Clément Brisset
a7a7ad775e Merge pull request #3896 from huffman/fix-entity-selection 
Fix entity tool selection when inactive
 2014-12-04 10:39:42 -08:00
Ryan Huffman
acd5495b2a Add getRelativeCenterPosition 2014-12-04 10:29:10 -08:00
Ryan Huffman
b2c5b19fd7 Remove print 2014-12-04 10:20:02 -08:00
Ryan Huffman
efdc8f5494 Fix stretch tools to work correctly with registrationPoint 2014-12-04 10:19:51 -08:00
DaveDubUK
f223f51fa6 Version 1.12 of the walk.js script 2014-12-04 18:15:25 +00:00
Ryan Huffman
53f195eec4 Fix position of overlays when registrationPoint is not centered 2014-12-04 10:05:34 -08:00
Ryan Huffman
f48d304df0 Add registrationPoint to SelectionManager 2014-12-04 10:03:54 -08:00
Ryan Huffman
74acf9513b Fix entity tool selection when inactive 2014-12-04 08:47:18 -08:00
Philip Rosedale
dd8deeea59 simpler butterflies script that doesn't put as much traffic on entity server 2014-12-03 22:39:11 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub
96c3bfceef Merge pull request #3889 from huffman/entity-tools-polish-2 
Entity tools polish - round 2
 2014-12-03 14:31:27 -08:00
Ryan Huffman
d08337326c Update selection box color to red 2014-12-03 12:59:51 -08:00
Stephen Birarda
f0b0c5fe0b change warp button to button face right 2014-12-03 11:08:41 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Ryan Huffman
5c5c66b265 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2 2014-12-03 08:40:38 -08:00
Ryan Huffman
4e78003520 Fix issue with selection boxes not being hidden 2014-12-02 18:03:00 -08:00
Ryan Huffman
f25d509363 Remove unused lastPlaneIntersection 2014-12-02 17:50:34 -08:00
Ryan Huffman
aa067bc153 Update UpDown translation to follow the mouse as other tools do 2014-12-02 17:49:25 -08:00
Ryan Huffman
c4ca7e1b18 Remove clearSelections from findClickedEntity - it shouldn't handle it 2014-12-02 16:01:40 -08:00
Ryan Huffman
30a7b60958 Update checkMove to only update rotation handles instead of all handles 2014-12-02 16:01:09 -08:00
Ryan Huffman
0fb0169ff2 Move baseOfEntityProjectionOverlay update to updateHandles() 2014-12-02 16:00:33 -08:00
Ryan Huffman
2f1ceb922a Increase size of selection boxes 2014-12-02 15:59:56 -08:00
Ryan Huffman
2b5a4e4563 Add selection boxes in multi-selection mode 2014-12-02 15:56:43 -08:00
Ryan Huffman
77365ec282 Move entity selection to click event and add ability to deselect 2014-12-02 15:49:45 -08:00