Commit graph

27827 commits

Author SHA1 Message Date
Brad Hefta-Gaub
2df75f8bff Merge pull request #5337 from bwent/audioStatsDialog
Added a dialog box to display Audio Network Statistics
2015-07-17 14:45:51 -07:00
Howard Stearns
c9658b2c13 Merge pull request #5354 from PhilipRosedale/master
Sample script flockOfBirds.js with sounds and flocking behavior
2015-07-17 13:15:08 -05:00
bwent
b22fd3f4a0 fixed lagging issues 2015-07-17 10:58:30 -07:00
Philip Rosedale
ee435d9732 remove comment 2015-07-17 09:43:33 -07:00
Philip Rosedale
689b0e2571 Improve to run correctly on startup as AC 2015-07-17 09:41:48 -07:00
Philip Rosedale
db219905f3 re-use audio injectors, don't check if isPlaying immediately after starting play out 2015-07-17 00:30:31 -07:00
Philip Rosedale
5c29eb97ef remove debug 2015-07-16 23:32:40 -07:00
Philip Rosedale
cf9365e616 Add new sample script with flocking 2015-07-16 22:46:41 -07:00
bwent
854a098180 keep track of channel id's within addChannel function, pass in when updating 2015-07-16 12:28:43 -07:00
Philip Rosedale
62fca613a6 Merge pull request #5345 from huffman/fix-edit-highlight
Fix bug where edit.js highlights an object after being turned off
2015-07-16 11:34:01 -07:00
Ryan Huffman
cf0940a65d Fix edit.js highlighting an object after being turned off 2015-07-16 11:07:01 -07:00
bwent
4c70c197e6 keep track of channel index with global variable 2015-07-15 17:19:57 -07:00
samcake
b7ac84e174 Merge pull request #5342 from ZappoMan/removeNakeGL
remove some more dead code and naked gl
2015-07-15 17:07:55 -07:00
Howard Stearns
01a3701b52 Merge pull request #5329 from SamGondelman/hydraFix
Hydra hand and mouse fixes
2015-07-15 19:03:04 -05:00
Andrew Meadows
eaa93c1a98 Merge pull request #5336 from sethalves/fix-polyvox-debug-vs-release
Fix polyvox debug vs release
2015-07-15 16:50:39 -07:00
bwent
0654bb5e36 Pass by reference into initialize and update function, remove dead code 2015-07-15 16:40:55 -07:00
Brad Hefta-Gaub
b276804e4f Merge pull request #5343 from samcake/daft
Clearing Model.cpp from naked gl call references
2015-07-15 16:40:10 -07:00
ZappoMan
5165210e11 fix Sams comment about comments 2015-07-15 16:35:20 -07:00
ZappoMan
d5a6e87a02 remove naked gl from Avatar::calculateDisplayNameTransform() 2015-07-15 16:34:23 -07:00
Seth Alves
934dcf4a8e Merge pull request #5335 from thoys/chess-fix
Fixes chess game (pieces were dieing as soon as you dropped them)
2015-07-15 16:31:11 -07:00
Seth Alves
7049242153 Merge pull request #5339 from AndrewMeadows/barium
remove hungarian notation from grab.js
2015-07-15 16:30:19 -07:00
bwent
c159068701 Make pointers member variables 2015-07-15 16:10:41 -07:00
Sam Gateau
9657d146f7 Clearing Model.cpp from naked gl call references 2015-07-15 16:09:53 -07:00
ZappoMan
7795eaace6 remove more naked gl 2015-07-15 15:56:27 -07:00
ZappoMan
d1e511efcb more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl 2015-07-15 15:52:12 -07:00
ZappoMan
2ad2c4d554 remove some dead code 2015-07-15 15:33:28 -07:00
Brad Hefta-Gaub
7d8f2e906b Merge pull request #5340 from cozza13/20617
CR for Job #20617 - Change default Minimum Desktop FPS
2015-07-15 14:59:43 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect
Remove the glow effect.
2015-07-15 14:50:15 -07:00
Seth Alves
4db66e7894 build separate debug and release versions of polyvox library 2015-07-15 14:38:44 -07:00
Brad Hefta-Gaub
ae6e7f05b6 Merge pull request #5341 from samcake/daft
Remove the glGet( viewport ) from DeferredLightingEffect
2015-07-15 14:26:08 -07:00
samcake
5e2fe8dbec Merge pull request #5333 from ZappoMan/removeNakeGL
Remove more naked GL
Tested
2015-07-15 14:19:05 -07:00
Seth Alves
930e570b48 build separate debug and release versions of polyvox library 2015-07-15 13:54:57 -07:00
Seth Alves
f1c10f5119 build separate debug and release versions of polyvox library 2015-07-15 13:38:12 -07:00
Andrew Meadows
a444d6a2a2 remove hungarian notation 2015-07-15 13:19:59 -07:00
ZappoMan
849b584596 more GlowEctomy 2015-07-15 13:16:38 -07:00
Chris Collins
ff288fdd5d While we work on FPS I have decreased the default LOD FPS
While we work on FPS I have decreased the default LOD FPS. In a new
users preferences this will now show as 15 desktop and 30 HMD.
2015-07-15 13:09:55 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
bwent
70e3e7caa4 Merge branch 'master' into audioStatsDialog 2015-07-15 12:29:33 -07:00
bwent
2c24251b52 Clean up from previous commit 2015-07-15 11:41:26 -07:00
Sam Gateau
48f23a6eaf Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-15 11:29:41 -07:00
bwent
5b0b7229ba Added a dialog box to display audio network statistics 2015-07-15 11:10:39 -07:00
Thijs Wenker
c24c6ad39f Fixes chess game (pieces were dieing as soon as you dropped them) 2015-07-15 19:56:01 +02:00
Seth Alves
3bc182730a build separate debug and release versions of polyvox library 2015-07-15 10:52:38 -07:00
ZappoMan
6b06987700 remove dead code for magnifier 2015-07-15 10:48:07 -07:00
Seth Alves
a71c5cae5f build separate debug and release versions of polyvox library 2015-07-15 10:33:22 -07:00
Seth Alves
443cfc8970 build separate debug and release versions of polyvox library 2015-07-15 10:31:21 -07:00
ZappoMan
0eeddddd6b removed naked GL from drawOnHUD overlays. 2015-07-15 09:46:58 -07:00
Seth Alves
fd84893c61 build separate debug and release versions of polyvox library 2015-07-15 09:42:26 -07:00
Seth Alves
316c322118 build separate debug and release versions of polyvox library 2015-07-15 09:36:51 -07:00