Commit graph

29158 commits

Author SHA1 Message Date
samcake
8dd85aab14 Merge pull request #2 from AndrewMeadows/californium
fix rendering on linux
2015-07-28 18:14:06 -07:00
Andrew Meadows
475d069185 fix rendering on linux 2015-07-28 18:12:10 -07:00
samcake
8e73df119b Merge pull request #1 from AndrewMeadows/californium
compile on linux with GLEW
2015-07-28 17:58:55 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Anthony J. Thibault
b06485c266 Remove cauterize code from Rig and move it back into Model.
* cauterize code is used as at render time and is not dependent on
  the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
  makes the decision to perform cauterization or not in preRender.
2015-07-28 17:45:33 -07:00
samcake
27d3d3f450 fix w to x 2015-07-28 15:51:15 -07:00
samcake
9cf3dfd3f7 test this on windows ? 2015-07-28 15:49:39 -07:00
Sam Gateau
8b20f9d3a6 do the minimum include to use glew on linux 2015-07-28 15:48:01 -07:00
ericrius1
469bace7ca removed unnessary computations from hit effect fragment shader 2015-07-28 15:15:34 -07:00
Sam Gateau
df9b66d267 Implement the uniform buffer and resource texture cache and their reset 2015-07-28 15:08:52 -07:00
Andrew Meadows
fa49342f00 Merge pull request #5420 from bwent/solar-system
Example script solarsystem.js with orbiting satellite game
2015-07-28 15:06:23 -07:00
Howard Stearns
a383f43f75 Merge pull request #5447 from AndrewMeadows/calcium
fix broken unit test builds
2015-07-28 14:34:20 -07:00
Philip Rosedale
cce6f15de2 Merge pull request #5443 from huffman/edit-camera-up
Update edit.js to swing up on activate so that it doesn't intersect with the avatar's head
2015-07-28 13:32:34 -07:00
Ryan Huffman
0b25fc335e Cleanup edit.js entity creation 2015-07-28 13:21:29 -07:00
Marcel Verhagen
34d63cdb43 Removed double "" 2015-07-28 22:02:36 +02:00
bwent
1107742188 Clean up formatting for satellite.js 2015-07-28 13:01:20 -07:00
bwent
5272a1d6e7 refactoring variables and constants, fix update loop to continue over unlaunched satellites 2015-07-28 13:01:20 -07:00
bwent
e0d6609a99 resolve file path issue 2015-07-28 13:01:20 -07:00
bwent
ccb3d433af Example script solarsystem.js with orbiting satellite game 2015-07-28 13:01:20 -07:00
bwent
2be95997d1 clean up formatting 2015-07-28 13:00:41 -07:00
bwent
d9693796bc Capture key events 2015-07-28 13:00:40 -07:00
bwent
774b4851c3 Add tab to highlight widgets and update using left and right arrow keys 2015-07-28 13:00:40 -07:00
bwent
b7d195e817 more subpanel fixes 2015-07-28 13:00:40 -07:00
bwent
252780dc5d fix checkbox class, make subpanels collapsable 2015-07-28 13:00:40 -07:00
bwent
4ae03184ec add subpanel functionality 2015-07-28 13:00:40 -07:00
bwent
b46ad0c397 Created subpanel panel item 2015-07-28 13:00:40 -07:00
Howard Stearns
4754615159 Fix NPC animations. 2015-07-28 12:34:10 -07:00
Andrew Meadows
d03a7d1b70 fix physics-tests build errors 2015-07-28 12:24:17 -07:00
Andrew Meadows
2aa453b610 fix build errors for shared-tests 2015-07-28 12:05:45 -07:00
Ryan Huffman
81e80996f7 Fix large marketplace imports not working 2015-07-28 11:24:33 -07:00
Howard Stearns
e7516aab02 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-28 11:17:35 -07:00
Sam Gateau
955b30ffd2 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-28 10:20:15 -07:00
Sam Gateau
22e70ee691 merged master 2015-07-28 10:13:05 -07:00
Andrew Meadows
6e41a79551 Merge pull request #5360 from BingShearer/Leaves
New falling leaf script based on the existing rain.js
2015-07-28 10:08:16 -07:00
Brad Hefta-Gaub
26111b9b80 Merge pull request #5365 from kevinmthomas-carpool/20485
20485
2015-07-28 09:59:43 -07:00
Brad Hefta-Gaub
43eec08514 Merge pull request #5376 from venkatn93/avatar
New ambient occlusion effect in render pipeline
2015-07-28 09:58:51 -07:00
Brad Hefta-Gaub
d8c2b41655 Merge pull request #5428 from kevinmthomas-carpool/20628
CR for Job #20628 - JS Stream Player For Domain-Zone
2015-07-28 09:58:04 -07:00
Brad Hefta-Gaub
ee641335fa Merge pull request #5421 from thoys/20552
CR for Job #20552 - Add the ability to modify the parameters of planky from a popup dialog
2015-07-28 09:57:22 -07:00
Brad Hefta-Gaub
6d1bfd8134 Merge pull request #5427 from kevinmthomas-carpool/20622
CR for Job #20622 - JS Stream Player
2015-07-28 09:56:39 -07:00
Philip Rosedale
275ab6b96b Merge pull request #5442 from ctrlaltdavid/throttle-fps-by-default
Make Throttle FPS If Not Focus be enabled by default
2015-07-27 20:39:56 -07:00
Howard Stearns
6433a48fdb Merge pull request #5441 from sethalves/fix-vhacd
if OBJ data isn't from a url, don't dereference null QUrl pointers
2015-07-27 20:27:44 -07:00
David Rowe
8a7cdb1c64 Make Throttle FPS If Not Focus be enabled by default 2015-07-27 19:53:38 -07:00
Seth Alves
f4a23065b4 if obj data isn't from a url, don't dereference null url pointer 2015-07-27 19:06:14 -07:00
Sam Gateau
baf7873ce1 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-27 17:40:19 -07:00
Sam Gateau
66c5aec744 Remove commented dead code 2015-07-27 17:34:46 -07:00
Sam Gateau
f525a8a245 Removing all the unecessary calls of Batch from the gl legacy time 2015-07-27 17:17:56 -07:00
Niraj Venkat
34e400ac67 Changing var name to 'DebugAmbientOcclusion' 2015-07-27 17:14:09 -07:00
Seth Alves
6e5aca6da4 merge from upstream 2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4 add some javascript callable stuff back to MyAvatar 2015-07-27 16:42:54 -07:00
Howard Stearns
1bb734aec0 Kill warnings. 2015-07-27 15:26:03 -07:00