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

1674 commits

Author SHA1 Message Date
Chris Collins
d15ae92e1e Guitar fix 
Guitar position fix
 2015-01-07 13:40:36 -08:00
Brad Hefta-Gaub
23559743d9 Merge pull request #4060 from PhilipRosedale/gun 
Added improved gun to /examples
 2015-01-07 13:16:09 -08:00
Brad Hefta-Gaub
49508733aa Merge pull request #4053 from cozza13/20254 
CR for Job #20254 - Additional Script updates
 2015-01-07 13:14:34 -08:00
Philip Rosedale
9bf56516e0 Added improved gun to /examples 2015-01-07 13:02:00 -08:00
Chris Collins
3a75a6f920 Minor typo fix 
Minor typo fix
 2015-01-07 12:57:40 -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
Ryan Huffman
fbdc509428 Increase size of url input boxes 2015-01-07 12:15:14 -08:00
Ryan Huffman
92fc08fa70 Update property list window to only show after selection 2015-01-07 12:14:47 -08:00
David Rowe
40274df279 Add downloads information changed event for JavaScript 2015-01-07 11:20:46 -08:00
Chris Collins
53f24954e0 Updates based on PR comments 
Commented out Camera.stopLooking and Camera.keepLookingAt . This can be
put back when we merge back the C++ issue.
 2015-01-07 11:15:30 -08:00
Chris Collins
816e369c08 More Script updates 
More Script updates
 2015-01-06 22:32:45 -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
David Rowe
8b0d859686 Add method to access downloads information in JavaScript 2015-01-06 15:54:07 -08:00
Chris Collins
95f8447191 Incremental update to scripts cleanup 
-Moved more of the scripts around
-Fixed up the location on assets on start. e.g. gun.js
-Removed additional Scripts.
 2015-01-06 15:47:25 -08:00
Chris Collins
602275a0f7 First pass moving scripts into an example folder. 
This is just a quick first pass to move some of the scripts into an
examples folder. There are also a couple of obvious deletions.
 2015-01-06 11:16:40 -08:00
Andrew Meadows
278be3d31b remove use of "radius" property for entities 
use "dimensions" instead
 2015-01-05 18:13:50 -08:00
Andrew Meadows
ec86f0bd50 fixing toyball.js to work under Bullet 2015-01-05 17:30:50 -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
125dc5010e Merge pull request #4039 from AndrewMeadows/inertia 
Bullet physics part 2
 2015-01-05 13:10:55 -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
Andrew Meadows
21b2d14956 converting existing JS scripts to use new damping 
Old formula the scripts were using:  v *= damping

So a value of 0.999 was "little damping" and a value of 0.001 was "very strong damping",
but now that is reversed.

New formula: v *= (1 j- damping)^dt

A damping value of 0.001 now means "very little damping"
and a value of 0.999 means "very strong damping".
 2015-01-05 11:25:15 -08:00
Ryan Huffman
cf04c3313a Update inWorldTestTone.js to play in front of avatar 2015-01-02 11:43:41 -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
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
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