Sam Gateau
17650dde74
Solving the coimpiling issue with Render-utils test
2015-07-29 11:49:22 -07:00
Sam Gateau
76acbde595
Removing the opengl and glew links from Interface since now coming from gpu lib
2015-07-29 09:54:10 -07:00
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
samcake
27d3d3f450
fix w to x
2015-07-28 15:51:15 -07:00
Sam Gateau
8b20f9d3a6
do the minimum include to use glew on linux
2015-07-28 15:48:01 -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
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
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
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
Niraj Venkat
34e400ac67
Changing var name to 'DebugAmbientOcclusion'
2015-07-27 17:14:09 -07:00
Niraj Venkat
d2ee74f7c7
Shader code indentation
2015-07-27 12:20:41 -07:00
Niraj Venkat
1193b89918
Coding standard and tab fixes
2015-07-27 12:14:29 -07:00
Bing Shearer
c46e73434c
Added small fix to error message code
2015-07-27 11:59:09 -07:00
Niraj Venkat
92595583ec
Coding standard and building
2015-07-27 11:55:17 -07:00
Brad Hefta-Gaub
9783740b21
Merge pull request #5436 from huffman/edit-oob
...
Show an alert window when new objects would be out of bounds
2015-07-27 11:47:54 -07:00
Brad Hefta-Gaub
9464fe8f90
Merge pull request #5433 from hyperlogic/ajt/particle-render-fix
...
Improved ParticleEffectEntityItem rendering and updates
2015-07-27 11:47:09 -07:00
Ryan Huffman
ceffbb6383
Update edit.js to show an alert window when new objects would be out of bounds
2015-07-27 11:41:53 -07:00
Brad Hefta-Gaub
e6f97810f4
Merge pull request #5434 from birarda/master
...
fix for OctreeSceneStat unpacking in Application
2015-07-27 11:14:57 -07:00
Bing Shearer
d54543e83c
Tidied up per Brad's request
2015-07-27 10:19:42 -07:00
Stephen Birarda
d3c6d8b3cc
move call to get VoxelPositionSize inside debug that uses it
2015-07-27 10:06:34 -07:00
Stephen Birarda
615218c77d
use a ref in stats unpacking
2015-07-27 09:58:58 -07:00
Stephen Birarda
9c57d1544f
fix OctreeSceneStat unpacking in Application
2015-07-27 09:53:27 -07:00
Anthony J. Thibault
604ef5dc71
Fixed float constant.
2015-07-27 09:28:56 -07:00
Anthony J. Thibault
5844b594dc
Converted magic numbers to constants.
2015-07-27 09:27:16 -07:00
Niraj Venkat
51e386aabd
Merge branch 'avatar' of https://github.com/venkatn93/hifi into avatar
2015-07-27 09:20:42 -07:00
Niraj Venkat
83e0856279
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-27 09:20:19 -07:00
Niraj Venkat
1f58ad5d87
Merging master
2015-07-27 09:18:24 -07:00
Kevin M. Thomas
a82bf1d407
Merge branch 'master' of https://github.com/highfidelity/hifi into 20622
2015-07-27 12:15:40 -04:00
Kevin M. Thomas
d17ddae537
Added .js file to examples/example/audio and added public bucket url functionality.
2015-07-27 12:14:50 -04:00
Brad Hefta-Gaub
a9d5723eb3
Merge pull request #5410 from kevinmthomas-carpool/20618
...
CR for Job #20618 - Move Reload Content item to Developer menu.
2015-07-26 21:54:55 -07:00
Anthony J. Thibault
5cc0b45850
Improved ParticleEffectEntityItem rendering and updates
...
* Created custom pipelines and shaders for untextured and textured
particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
now we just update all the time. (super cheap tho, if there are no particles
animating)
2015-07-26 17:21:17 -07:00
Brad Hefta-Gaub
8a34df380c
Merge pull request #5432 from sethalves/quiet-compiler
...
quiet compiler
2015-07-26 12:06:40 -07:00
