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

23831 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
d6f43287dc pull the lobby from default scripts to avoid permanent iron man 2015-04-01 14:21:43 -07:00
Bradley Austin Davis
3b77118baa Merge branch 'master' into oculus_old_renderer 2015-04-01 14:09:29 -07:00
Philip Rosedale
b5f79c7e6e Merge pull request #4571 from huffman/select-all-edit 
Add select all on focus behavior to entity properties window
 2015-04-01 14:06:00 -07:00
Andrew Meadows
0249b8c9c5 fix backwards comparison logic 2015-04-01 13:56:05 -07:00
Ryan Huffman
f0dd20b21e Merge pull request #4570 from samcake/orange 
Clean up the sunLightExample.js and create the cookies.js
 2015-04-01 13:55:03 -07:00
Andrew Meadows
245729cba8 fix for avatar unable to jump into hover on mac 2015-04-01 13:47:40 -07:00
ZappoMan
aac824fb99 fix crash on shutdown 2015-04-01 13:47:25 -07:00
Philip Rosedale
cd40b82e7d Merge pull request #4568 from huffman/line-height-update 
Update edit.js lineHeight to be more usable
 2015-04-01 13:44:57 -07:00
Philip Rosedale
4ec1d304e0 Merge pull request #4567 from thoys/20423 
CR for Job #20423 - Take gun.js to the next level.
 2015-04-01 13:43:52 -07:00
Sam Gateau
9918357724 fix var declaration issues 2015-04-01 13:37:41 -07:00
Bradley Austin Davis
a7dc1d26e6 Working on SDK vs client distortion performance differences 2015-04-01 13:23:55 -07:00
Brad Hefta-Gaub
1de1527414 Merge pull request #4569 from ctrlaltdavid/20431 
CR for Job #20431 - Remove XMLHttpRequest file reading and model uploading
 2015-04-01 13:00:16 -07:00
Ryan Huffman
c835fb63c3 Add select all on focus behavior to entity properties window 2015-04-01 12:52:46 -07:00
Sam Gateau
695a5bcfd7 Adding the cookies sciprt that provide a simple ui useful for debug and example, complete the interface on the scene script interface to provide the getters 2015-04-01 12:23:31 -07:00
Sam Gateau
3b92910a91 Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters 2015-04-01 12:22:35 -07:00
Bradley Austin Davis
51d3aba71c Restoring SDK install target 2015-04-01 12:10:25 -07:00
Seth Alves
b4612b25e5 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-01 11:39:06 -07:00
Seth Alves
c035de4e73 cleanups 2015-04-01 11:38:54 -07:00
David Rowe
e519928320 Move friends window to own class 2015-04-01 11:38:32 -07:00
Ryan Huffman
eb7d940ed9 Update edit.js lineHeight property handling 2015-04-01 11:36:05 -07:00
Bradley Austin Davis
71233780e9 Pointing to an Oculus SDK build that works on linux (I hope) 2015-04-01 11:26:24 -07:00
Seth Alves
4859278214 get rid of point/tri bounce structures in favor of FBXGeometry 2015-04-01 11:17:25 -07:00
Bradley Austin Davis
e3ae6354c4 Tie the Linux Oculus SDK to a given commit ID, so it can't invisibly break in the background in the repo is updted 2015-04-01 11:08:13 -07:00
Bradley Austin Davis
cebd2705c4 Updating windows Oculus SDK to 0.5.0.1 2015-04-01 11:06:22 -07:00
Thijs Wenker
f3ff48ab60 Merge branch 'master' of https://github.com/worklist/hifi into 20423 2015-04-01 19:14:14 +02:00
Thijs Wenker
bd8ea7bfc0 Merge branch 'master' of github.com:PhilipRosedale/hifi into 20423 
Conflicts:
	examples/controllers/hydra/gun.js
 2015-04-01 19:13:46 +02:00
Stephen Birarda
92c55f9cf0 Merge pull request #4557 from ZappoMan/avatarUI 
first simple pass at using marketplace windows in preferences
 2015-04-01 09:45:56 -07:00
Andrew Meadows
e27f800c75 Merge pull request #4561 from sethalves/island 
scaling hints to hash, larger collision shapes
 2015-04-01 09:40:18 -07:00
ZappoMan
da9a8e8a97 CR feedback 2015-04-01 09:27:58 -07:00
Seth Alves
23903570f0 added more options to v-hacd util, messed with fatten-mesh code some more 2015-04-01 09:19:34 -07:00
ZappoMan
827e37b920 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-04-01 09:09:50 -07:00
Bradley Austin Davis
e520a62bcf Merge branch 'master' into oculus_old_renderer 2015-04-01 09:09:06 -07:00
Philip Rosedale
9709724cc2 Merge pull request #4542 from stojce/20429 
CR for Job #20429 - Add "Create account" link to Qt login dialog in Interface
 2015-04-01 09:06:43 -07:00
Stephen Birarda
a1f1f7603d Merge pull request #4564 from PhilipRosedale/master 
Buttons at bottom in dice, gun so not to conflict with edit.js
 2015-04-01 09:06:34 -07:00
Thijs Wenker
f22c739642 updated gunscript 2015-04-01 16:26:55 +02:00
Stojce Slavkovski
8514a39812 Use constants for URLs 2015-04-01 07:24:16 +02:00
Philip Rosedale
9642bd199d Buttons at bottom 2015-03-31 22:12:06 -07:00
Philip Rosedale
8114fdd1e2 move button locations, names some constants in avatar controller 2015-03-31 21:51:50 -07:00
Stojce Slavkovski
7b3d33c2a4 Merge branch 'master' of https://github.com/highfidelity/hifi into 20429 2015-04-01 06:48:09 +02:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
Seth Alves
0f967f5971 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 20:43:28 -07:00
Philip Rosedale
647ad18812 Merge pull request #4563 from ericrius1/master 
added unload function to lightController.js so light is deleted when it'...
 2015-03-31 19:31:38 -07:00
Eric Levin
fd3fc0acdd added unload function to lightController.js so light is deleted when it's parent entity is 2015-03-31 19:08:30 -07:00
Seth Alves
380d03b3b2 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 19:00:19 -07:00
Stephen Birarda
1d5f1807f7 Merge pull request #4562 from sethalves/editors-are-rezzers 
add a bool value to Node which indicates if it is allowed to rez new ent...
 2015-03-31 18:53:29 -07:00
Seth Alves
04901e99fc fix error message 2015-03-31 18:41:29 -07:00
Seth Alves
8bca8ad4ef bump protocol versions for PacketTypeDomainList and PacketTypeDomainListRequest 2015-03-31 18:37:42 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
eb816f7f6a Adding support for eye per frame mode and offscreen render scaling 2015-03-31 18:24:58 -07:00