Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 07:10:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26556 commits 71 branches 59 tags 1.2 GiB
Commit graph

2543 commits

Author SHA1 Message Date
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Philip Rosedale
b32994b359 Merge pull request #5083 from ctrlaltdavid/20551 
CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace
 2015-06-10 22:32:25 -07:00
Niraj Venkat
9ed8daa97c Removing unnecessary functions 2015-06-10 15:33:07 -07:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Niraj Venkat
4617b7331c Working on creating functions to serialize and deserialize properties 2015-06-10 09:50:47 -07:00
Niraj Venkat
d90e43c5aa Adding text boxes for hyperlink href and description 2015-06-09 16:15:47 -07:00
Stephen Birarda
091ed5b514 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 15:51:45 -07:00
David Rowe
a4885ff38c Close directory window after domain change 2015-06-09 12:33:30 -07:00
David Rowe
cb6aef16e6 Merge branch 'master' into 20551 2015-06-09 09:36:44 -07:00
David Rowe
9e3ce344fb Display directory button just above edit toobar 2015-06-09 07:26:18 -07:00
Brad Hefta-Gaub
3fb5e47dcc Merge pull request #5064 from ericrius1/paint 
bumped max line points to 80
 2015-06-08 21:20:58 -07:00
Seth Alves
f491a7a786 Merge pull request #5084 from AndrewMeadows/inertia 
rewrite grab.js to follow mouse
 2015-06-08 17:35:03 -07:00
Brad Davis
90c18d0c48 Merge pull request #5080 from ZappoMan/team-teaching 
Merge TEAM-TEACHING into MASTER
 2015-06-08 17:34:42 -07:00
Andrew Meadows
b682a07714 merge upstream/master into andrew/inertia 
Conflicts:
	examples/grab.js
 2015-06-08 17:28:14 -07:00
Andrew Meadows
ef1e3aae00 faster move and max solid angle for distant grabs 2015-06-08 16:59:33 -07:00
Andrew Meadows
ffeac220f9 fix typo in variable name 2015-06-08 16:40:50 -07:00
Andrew Meadows
e70cd9edd9 remove unused variable 2015-06-08 15:11:42 -07:00
Andrew Meadows
4647f84638 rewrite grab.js to follow mouse 2015-06-08 14:58:42 -07:00
Eric Levin
6d59518149 added meditative ocean landscape and common utilities file 2015-06-08 14:02:38 -07:00
ZappoMan
24c8e7d0e6 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 13:50:50 -07:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
Stephen Birarda
4e755e304b fix spacing in new JS file 2015-06-08 11:31:24 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
David Rowe
f51feca37d Add directory button 2015-06-08 11:29:35 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Sam Gateau
8d3a3221b0 shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
Seth Alves
037a70b03a undo unneeded/breaky change in grab.js 2015-06-05 13:47:07 -07:00
ZappoMan
7dc0e8a66c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 12:21:29 -07:00
Eric Levin
21aa3b62bc bumped max line points to 80 2015-06-05 12:04:32 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Philip Rosedale
1f11625db4 Merge pull request #5060 from ericrius1/paint 
moved ball marker closer to hand so painting feels more visceral
 2015-06-05 11:26:22 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Eric Levin
9f974c3b5c moves ball marker closer to avatar for mouse as well 2015-06-05 10:19:39 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Eric Levin
30ba7ffc29 moved ball marker closer to hand so painting feels more visceral 2015-06-05 09:36:12 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume 
Smooth initial crash volume
 2015-06-05 08:40:09 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Eric Levin
fd8126510d marker ball now stays without mouse whether or not user is drawing 2015-06-04 21:41:19 -07:00
Eric Levin
9264ef980c added redo and undo functionality to mouse component of paint script, and fixed overlay not being deleted on script ending bug 2015-06-04 21:13:16 -07:00
Philip Rosedale
8c32f8f396 Merge pull request #5054 from ericrius1/paint 
added paint.js and line rider script. Users can paint lines with hydr…
 2015-06-04 20:52:23 -07:00
Eric Levin
f276ca30cd refactoring for common functions. Fix for randFloat 2015-06-04 17:55:55 -07:00
Eric Levin
241330442c added paint.js and line rider script. Users can paint lines with hydra or mouse, and then go on a ride over the line they just created. 2015-06-04 17:35:26 -07:00
Eric Levin
1fd0650955 removing overlay on script ending 2015-06-04 16:54:52 -07:00
Eric Levin
a2ae51371b updated pointer.js script to work with new line entity 2015-06-04 15:44:39 -07:00
Howard Stearns
5727400b9a Sound toys script (in examples/soundToys.js) 2015-06-04 14:20:19 -07:00
Sam Gateau
b339aa683a adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items 2015-06-03 11:25:45 -07:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
Seth Alves
a85a0b863d icon for create-polyvox button 2015-06-02 16:25:38 -07:00