Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-09 05:18:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26627 commits 69 branches 58 tags 1.2 GiB
Commit graph

26627 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niraj Venkat
a577d7955c Removed classes and the "hyperlink entity" 2015-06-09 11:27:57 -07:00
Seth Alves
ccb2f17b33 grab.js rotation sort-of works now 2015-06-09 11:21:13 -07:00
Niraj Venkat
2bb1bf8afe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 10:33:39 -07:00
Niraj Venkat
1bf0b15bb0 Removing unnecessary files 2015-06-09 10:33:05 -07:00
Niraj Venkat
0004b1a81c Reversing previous entity work and creation of property group 2015-06-09 10:32:25 -07:00
Sam Gondelman
0769593ca8 added getters/setters for Inputs and InputChannels 2015-06-09 10:20:36 -07:00
Sam Gondelman
d3a4eec5c5 removed dead code, magic numbers 2015-06-09 09:56:40 -07:00
Seth Alves
42f94307d5 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-09 09:51:29 -07:00
Sam Gondelman
b1b2d1f85c ;) (added semicolons to js example) 2015-06-09 09:45:19 -07:00
David Rowe
cb6aef16e6 Merge branch 'master' into 20551 2015-06-09 09:36:44 -07:00
Brad Hefta-Gaub
759a4a323b Merge pull request #5087 from Atlante45/debug 
Reduce debug on domain connection
 2015-06-09 07:54:21 -07:00
Atlante45
bf56ee49a6 Print new URL only when it actually changes 2015-06-09 16:37:48 +02:00
David Rowe
9e3ce344fb Display directory button just above edit toobar 2015-06-09 07:26:18 -07:00
Clément Brisset
6d34bff372 Merge pull request #5086 from sethalves/quiet-compiler 
quiet compiler, fix some whitespace
 2015-06-09 15:42:54 +02:00
Atlante45
90c9a82aeb Remove unnecesary debug 2015-06-09 15:27:08 +02:00
Atlante45
303026d86b Reduce qDebug calls 2015-06-09 15:26:41 +02:00
Brad Davis
873f73ffb4 Working on cursor manager 2015-06-09 00:39:49 -07:00
Seth Alves
fb7a0e7219 back out previous change, fix error where translucent is used instead of translucentMesh 2015-06-08 22:41:59 -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
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Seth Alves
2fb64aad91 fix variable name 2015-06-08 20:31:35 -07:00
Brad Davis
c360dde71a Merge branch 'master' into render_cursor 
Conflicts:
	interface/src/Application.cpp
 2015-06-08 20:18:32 -07:00
Seth Alves
14a45e8349 convert grab.js to use spring action. rotation doesn't work right, yet 2015-06-08 18:25:58 -07:00
Seth Alves
eb85f7f818 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-08 17:37:56 -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
Seth Alves
b3bc9c3ef0 first attempt at getting spring-action to handle rotation 2015-06-08 17:10:13 -07:00
Andrew Meadows
ef1e3aae00 faster move and max solid angle for distant grabs 2015-06-08 16:59:33 -07:00
Stephen Birarda
c73ccba427 Merge pull request #5074 from howard-stearns/restartable-non-local-sound 
Fix AudioInjector::restart() for the non-local case.
 2015-06-08 19:55:17 -04:00
Andrew Meadows
ffeac220f9 fix typo in variable name 2015-06-08 16:40:50 -07:00
Niraj Venkat
dbb447c9b5 Exposing Hyperlink type to javascript 2015-06-08 16:09:06 -07:00
Howard Stearns
d02fac3db3 Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound 2015-06-08 16:01:54 -07:00
Philip Rosedale
016b9c2ab9 Merge pull request #5081 from ericrius1/dynamicLandscape 
added meditative ocean landscape and common utilities file
 2015-06-08 15:47:13 -07:00
Howard Stearns
8e41c58fad Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound 2015-06-08 15:45:30 -07:00
Niraj Venkat
63665d720a Fixed bug by adding hyperlink props to flags. Safe to merge 2015-06-08 15:32:21 -07:00
Andrew Meadows
e70cd9edd9 remove unused variable 2015-06-08 15:11:42 -07:00
ZappoMan
1dca379e1a dead code removal machine 2015-06-08 15:06:44 -07:00
Andrew Meadows
4647f84638 rewrite grab.js to follow mouse 2015-06-08 14:58:42 -07:00
ZappoMan
b50b7dd500 CR feedback 2015-06-08 14:36:31 -07:00
ZappoMan
8fa31ec521 dead code removal machine 2015-06-08 14:30:31 -07:00
Howard Stearns
564b0b48ef Alternate version that uses signal rather than polling. 2015-06-08 14:29:43 -07:00
Seth Alves
1e858d8bc5 start on spring action 2015-06-08 14:16:03 -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
Niraj Venkat
cd93128236 [ERRORS] Starting on hyperlink entity and properties 2015-06-08 13:29:54 -07:00
samcake
ad2b9b32f4 Merge pull request #5079 from ZappoMan/team-teching-optimize 
TEAM TEACHING: use emplace_back and pre-reserved sizes for vectors
 2015-06-08 22:22:17 +02:00
Brad Hefta-Gaub
773e0b1d5b Merge pull request #5078 from ZappoMan/team-teaching 
TEAM TEACHING - merge from master
 2015-06-08 12:48:23 -07:00
ZappoMan
26ef6af009 use emplace_back and pre-reserved sizes for vectors 2015-06-08 12:45:39 -07:00
Philip Rosedale
7c0e70b1d1 Merge pull request #5076 from birarda/master 
play a local sound once first AM packet received
 2015-06-08 12:31:30 -07:00