Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 03:27:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25616 commits 76 branches 59 tags 1.2 GiB
Commit graph

25616 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
36b396b9ef Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid 
Fix visibility of binary eyelid control menu item
 2015-05-15 17:19:15 -07:00
Philip Rosedale
831148e280 Merge pull request #4888 from sethalves/finglonger 
more pointer.js fixes
 2015-05-15 17:18:32 -07:00
Philip Rosedale
1c3873358d Merge pull request #4896 from huffman/update-web-icon 
Update web icon
 2015-05-15 17:18:11 -07:00
Philip Rosedale
534869a7ad Merge pull request #4889 from ericrius1/dice 
changed dice to use collisionSoundURL prop
 2015-05-15 17:17:45 -07:00
Philip Rosedale
0d00393eff Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation 
Fix facetracker rotation
 2015-05-15 17:17:30 -07:00
Philip Rosedale
edf963ab8f Merge pull request #4895 from ericrius1/hockey 
Hockey
 2015-05-15 17:17:07 -07:00
Stephen Birarda
b8b5ff4aca fixes for temporary domain creation 2015-05-15 17:14:51 -07:00
Stephen Birarda
edf9042ed5 add hifi link to table, make table icons anchors 2015-05-15 17:12:19 -07:00
Nex Pro
75ddad7ec1 Added values for friction and restitution in the entity parameters. 2015-05-16 00:43:05 +01:00
Stephen Birarda
60a8dc1eb3 add initial version of places table in domain-server 2015-05-15 16:33:12 -07:00
Ryan Huffman
a0369d243a Update web icon 2015-05-15 15:58:02 -07:00
Eric Levin
9bfca7f54d 'moved icons up so they don't interfere with dice icons and changed spanw icon from dice to puck icon' 
'
 2015-05-15 15:43:23 -07:00
Sam Cake
c3dfd574b4 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 15:27:14 -07:00
Sam Cake
07fe43e175 moving forward with the void* hack for gpu::Texture 2015-05-15 15:26:40 -07:00
Eric Levin
6e1c5d704c 'modified airHockey script to be able to spawn and delete using buttons, added light flashing on score, and puck now respawns on player's side who just got scored on 2015-05-15 15:24:10 -07:00
Stephen Birarda
7caaa757fd change paths label to places/paths 2015-05-15 14:51:53 -07:00
Atlante45
407d1bd013 Merge branch 'master' of https://github.com/highfidelity/hifi into warings 2015-05-15 23:27:04 +02:00
Seth Alves
60bd345e57 shorter timeout 2015-05-15 14:20:29 -07:00
Seth Alves
0d3add8596 left mouse button only 2015-05-15 14:16:06 -07:00
Seth Alves
aeb5cead65 more fixes to pointer.js 2015-05-15 14:02:25 -07:00
Eric Levin
9c6be26290 changed dice to use collisionSoundURL prop 2015-05-15 13:55:48 -07:00
Seth Alves
042713d1ec Merge branch 'master' of github.com:highfidelity/hifi into finglonger 2015-05-15 13:55:28 -07:00
Seth Alves
f535bd2a76 more fixes to pointer.js 2015-05-15 13:54:24 -07:00
Philip Rosedale
650e8a54af Merge pull request #4879 from jherico/hmd_pick 
Fix mouse picking in the HMD
 2015-05-15 13:50:54 -07:00
Seth Alves
de8d06acf6 Merge pull request #4887 from PhilipRosedale/hockeygame 
remove line pointers from grab and hockey grab
 2015-05-15 13:43:55 -07:00
Philip Rosedale
36031eb308 Merge pull request #4886 from sethalves/finglonger 
rays never pick a line entity.  some fixes to pointer.js
 2015-05-15 13:27:13 -07:00
Philip Rosedale
cb0112e14e remove line pointers from grab and hockey grab 2015-05-15 13:21:58 -07:00
Stephen Birarda
bfa069a26b handle domain ID removal and account disconnection 2015-05-15 13:15:09 -07:00
Seth Alves
09f900862b Merge branch 'master' of github.com:highfidelity/hifi into finglonger 2015-05-15 13:14:06 -07:00
Stephen Birarda
a675b0a891 fix locked link button in settings 2015-05-15 13:10:32 -07:00
Seth Alves
bb3d1a6a58 rays never pick a line entity. some fixes to pointer.js 2015-05-15 13:10:16 -07:00
Atlante45
940363bf2e Fix activeRendernigThread check 2015-05-15 21:36:37 +02:00
Atlante45
cb02ef9277 Remove warnings 2015-05-15 21:35:47 +02:00
Sam Cake
97b18fcd52 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 11:29:43 -07:00
Sam Cake
765145b898 Moving the load of the texture and the generation of the cube map irradiance in the same thread 2015-05-15 11:28:59 -07:00
Stephen Birarda
82cb55e602 handle case where account is locked 2015-05-15 11:26:06 -07:00
Andrew Meadows
80f917a960 Merge pull request #4884 from howard-stearns/collision-sound-robustness 
Collision sound robustness
 2015-05-15 11:20:37 -07:00
Stephen Birarda
78fa82515a use constant IDs for domain buttons 2015-05-15 11:19:44 -07:00
Stephen Birarda
c0473adec9 add button to create new domain ID in settings 2015-05-15 11:18:12 -07:00
Stephen Birarda
bb936657ae handle domain creation during account connect flow 2015-05-15 11:09:00 -07:00
Howard Stearns
9f7a56e3e5 Ask audio injector to delete itself. 
Put in null guards.
Tune parameters (including higher threshold).
 2015-05-15 11:00:28 -07:00
Howard Stearns
56bc4dc079 Merge branch 'master' of https://github.com/highfidelity/hifi into collision-sound-tuning 2015-05-15 10:56:36 -07:00
Brad Hefta-Gaub
fc4887a61a Merge pull request #4882 from birarda/master 
add error log debug for script load fail
 2015-05-15 10:40:10 -07:00
Philip Rosedale
2df3f36420 Merge pull request #4880 from sethalves/finglonger 
laser-poiner script for mouse
 2015-05-15 10:39:20 -07:00
Stephen Birarda
e462617a6b add error log debug for script fail 2015-05-15 10:29:24 -07:00
Howard Stearns
3600a5def8 Merge branch 'master' of https://github.com/highfidelity/hifi into collision-sound-tuning 2015-05-15 10:25:03 -07:00
Stephen Birarda
6419a148d4 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-05-15 10:20:12 -07:00
David Rowe
d3cb6a9334 Fix visibility of binary eyelid control menu item 2015-05-15 09:40:32 -07:00
Seth Alves
1161f33b45 laser-poiner script for mouse 2015-05-14 20:25:29 -07:00
Brad Davis
6797174b97 Fix picking in the HMD 2015-05-14 19:15:47 -07:00