Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16684 commits 71 branches 56 tags 1.2 GiB
Commit graph

16684 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
c76749448a Merge pull request #3398 from AndrewMeadows/inertia 
fix velocity drift of MyAvatar
 2014-09-12 12:53:51 -07:00
Brad Hefta-Gaub
16d4563af0 Merge pull request #3383 from Adrianl3d/19977 
Code Review for Job #19977
 2014-09-12 12:53:28 -07:00
Stephen Birarda
892e0e7cbf fix node auth url, NAN break on windows 2014-09-12 11:43:50 -07:00
Stephen Birarda
88a75a3585 fix for goToUser from ChatWindow 2014-09-12 11:27:54 -07:00
Stephen Birarda
348bcdb37a resolve conflicts on merge with upstream master 2014-09-12 11:23:16 -07:00
Stephen Birarda
1084483dd5 fix for default param of default constructed quat 2014-09-12 11:22:34 -07:00
Stephen Birarda
93ff34baaa force address bar lookup through handleLookupString 2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d fix broken hifi linking 2014-09-12 11:19:22 -07:00
ZappoMan
45fc8423ba move getRadius to public for now 2014-09-12 10:26:47 -07:00
ZappoMan
64e2033b30 move getRadius to public for now 2014-09-12 10:26:24 -07:00
Stephen Birarda
b77a3f4904 cleanup application file event handler 2014-09-12 10:15:51 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
Stephen Birarda
7896119228 remap two goToUrl calls to AddressManager 2014-09-12 09:56:40 -07:00
Stephen Birarda
74295a3869 repairs for new location lookup 2014-09-12 09:52:34 -07:00
ZappoMan
e8c1cb7db8 read old format files correctly 2014-09-12 09:38:35 -07:00
Stephen Birarda
745edb8b0a fix error handling for location naming 2014-09-12 09:10:47 -07:00
ZappoMan
25d051090a swap order of local vs server changes in entity scripting to improve potential conflicts 2014-09-12 08:48:40 -07:00
ZappoMan
16f9d60df7 upgrade butterflies to use dimensions 2014-09-12 08:34:02 -07:00
ZappoMan
baaf01683e removed some verbose comments 2014-09-12 08:23:13 -07:00
ZappoMan
bc29848476 removed extra lines 2014-09-12 08:21:03 -07:00
ZappoMan
67f6f4c852 removed dead code 2014-09-12 08:19:46 -07:00
ZappoMan
024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
 2014-09-12 08:18:09 -07:00
ZappoMan
4bce7f8c0b removed debug 2014-09-12 08:14:28 -07:00
ZappoMan
54ef5d4698 fixed bugs in MovingEntitiesOperator, improved getDistanceToBottomOfEntity, isRestingOnSurface 2014-09-12 07:45:33 -07:00
Andrew Meadows
645d573772 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-09-12 07:37:30 -07:00
Philip Rosedale
8428b1a4ba Merge pull request #3401 from chansensturm/audio-noise 
New stereo audio panning object
 2014-09-11 17:53:55 -07:00
Stephen Birarda
5f6563f4c9 don't allow named location creation with no domain UUID 2014-09-11 17:42:04 -07:00
Craig Hansen-Sturm
ee0f8acaf4 Merge pull request #3396 from ZappoMan/someCleanup 
Some cleanup
 2014-09-11 17:38:40 -07:00
Stephen Birarda
7964180905 handle place creation at new API endpoint 2014-09-11 17:33:01 -07:00
Thijs Wenker
e62380a171 globalServicesExample.js 2014-09-12 02:23:25 +02:00
Craig Hansen-Sturm
ecae9d5e85 compiler warnings 2014-09-11 17:20:15 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00
Thijs Wenker
807173ae0a the GlobalServices Events are functional now 2014-09-12 02:17:36 +02:00
Thijs Wenker
753dedce22 combobox support in the Window.form javascript function 
example: Window.form('combobox', {label: "yourcombobox", ["opt #1.", "opt #2.", "opt #3."]});
 2014-09-12 02:16:23 +02:00
Craig Hansen-Sturm
1d0ba52445 implemented new audio panning object which implements constant power sin^2+cos^2=1 law 2014-09-11 17:15:49 -07:00
ZappoMan
77dff69805 fix ray picking to work with registation points 2014-09-11 17:03:01 -07:00
ZappoMan
695569b64b reconcile use of getAACube() and handle rotations properly 2014-09-11 16:43:53 -07:00
ZappoMan
2148baae21 add boxInFrustum 2014-09-11 16:40:32 -07:00
ZappoMan
9f4d199440 move bound proxy rendering to EntityTreeRedering, added helper functions for various bounding boxes 2014-09-11 15:36:13 -07:00
Andrzej Kapolka
1c50b32400 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-11 15:32:35 -07:00
Andrzej Kapolka
870b0c80cf Default blendshape mappings for Mixamo models. 2014-09-11 15:24:23 -07:00
Ryan Huffman
ffa47b1923 Add header comment to gracefulControls.js 2014-09-11 15:22:04 -07:00
Ryan Huffman
3724472758 Remove extra local variable in getCursorPosition 2014-09-11 15:20:41 -07:00
Ryan Huffman
50090c62f2 Update MAX_SPEED and ACCELERATION in gracefulControls.js 2014-09-11 15:16:42 -07:00
Andrew Meadows
2ffbdbec8c remove warning about extra tokens at end of #endif directive 2014-09-11 15:04:31 -07:00
Andrew Meadows
93864ee869 fix velocity drift of MyAvatar 2014-09-11 15:03:11 -07:00
Brad Hefta-Gaub
f33bd82ed8 Merge pull request #3395 from PhilipRosedale/master 
Updated move and butterfly scripts, entity renderer uses glutCube to temporarily fix crash
 2014-09-11 14:32:14 -07:00
Andrzej Kapolka
b731a234c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-11 14:15:51 -07:00
Stephen Birarda
afef42509d Merge pull request #3397 from birarda/fix-stuck-drive-key 
fix for MyAvatar save crash
 2014-09-11 14:13:45 -07:00
Stephen Birarda
52176786d0 use prefix and not postfix operator 2014-09-11 14:13:39 -07:00