Commit graph

21176 commits

Author SHA1 Message Date
Philip Rosedale
6567fcfe0b Added shootable blocks on platform, grenade, buttons for making grid of targets 2015-01-21 16:17:25 -08:00
Andrzej Kapolka
8bd944e32e Incremental improvement to stitching. 2015-01-21 16:10:00 -08:00
Ryan Huffman
ba2f7d88ce Update ImageOverlay to use TextureCache 2015-01-21 15:09:09 -08:00
Ryan Huffman
53a70c43e1 Add width and height to NetworkTexture 2015-01-21 15:08:38 -08:00
Andrew Meadows
1b7074e52a purge EntityCollisionSystem 2015-01-21 14:16:34 -08:00
Stephen Birarda
25016ef157 have RenderingClient handle returned audio frames 2015-01-21 14:10:29 -08:00
Philip Rosedale
78f157d6b0 Merge pull request #4145 from huffman/fix-dpi
Update style.css to use pt instead of px for proper rendering on hidpi s...
2015-01-21 14:09:41 -08:00
Andrew Meadows
1c38b08e8f remane emitEntityCollision... to entityCollision... 2015-01-21 14:07:23 -08:00
Philip Rosedale
e02e0088af Improvements to gun to add shootable targets on a platform 2015-01-21 13:58:48 -08:00
Stephen Birarda
5716f576b7 output archive to current binary dir 2015-01-21 13:30:28 -08:00
Stephen Birarda
e7ba900cda add debug for dependency links 2015-01-21 13:29:04 -08:00
Stephen Birarda
a3529e745b fix warning and compile with Multimedia 2015-01-21 13:28:18 -08:00
Stephen Birarda
343b09c855 remove AudioClient dependency on Recorder 2015-01-21 13:21:37 -08:00
Stephen Birarda
eebb21656e fix so Gverb is found on android 2015-01-21 13:20:21 -08:00
Stephen Birarda
3ea699d31b remove user CMakeLists, fix path in FindGverb 2015-01-21 13:00:15 -08:00
Andrzej Kapolka
8636f0c48e Simplification. 2015-01-21 12:57:24 -08:00
Stephen Birarda
e34fb66be7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-21 12:41:20 -08:00
Stephen Birarda
693c52da55 hand off audio bandwidth to BandwidthManager 2015-01-21 12:39:04 -08:00
Stephen Birarda
1a87fa93f4 output signals from AudioClient for I/O bytes 2015-01-21 12:33:20 -08:00
Stephen Birarda
f885dc229b final fixes for Audio includes in Interface 2015-01-21 12:31:10 -08:00
Ryan Huffman
2171427bbd Update style.css to use pt instead of px for proper rendering on hidpi screens 2015-01-21 12:31:06 -08:00
Andrzej Kapolka
87e3339791 Fix for normal selection with degenerate triangles. 2015-01-21 12:28:05 -08:00
Andrew Meadows
cb536c5d4e Merge pull request #4143 from murillodigital/windows-bullet
Windows bullet
2015-01-21 12:13:04 -08:00
Stephen Birarda
707973f1e5 solve collision in PositionGetter with AddressManager 2015-01-21 12:05:12 -08:00
Stephen Birarda
b2a9cdde8b migrate Audio header in AudioToolBox 2015-01-21 12:04:33 -08:00
Stephen Birarda
429d660dd6 migrate Audio includes to AudioClient 2015-01-21 12:04:06 -08:00
Stephen Birarda
d2af9a2911 have Application pass audio pos/orientation to AudioClient 2015-01-21 12:03:11 -08:00
Andrew Meadows
6840daa0b5 removing tabs from formatting 2015-01-21 11:55:28 -08:00
Stephen Birarda
e28ca27ccd add a position and orientation getter for AudioClient 2015-01-21 11:55:12 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Andrew Meadows
e49c76656f merge upstream/master into andrew/isentropic
Conflicts:
	libraries/physics/src/PhysicsEngine.cpp
2015-01-21 11:35:36 -08:00
Andrew Meadows
86583f3f3f physics collisions emit script collision events 2015-01-21 11:27:32 -08:00
Stephen Birarda
57743f126f fix asterisk squish to type 2015-01-21 10:53:15 -08:00
Leonardo Murillo
a825f2a495 Markdown fix 2015-01-21 11:31:24 -06:00
Leonardo Murillo
93edd82038 Markdown fix 2015-01-21 11:28:50 -06:00
Leonardo Murillo
e82b07caf8 Updated Windows build instructions 2015-01-21 11:26:43 -06:00
Philip Rosedale
ffbe924734 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-21 09:12:15 -08:00
Andrew Meadows
b8f97ca978 Merge pull request #4142 from ey6es/master
Fix for color/material texture alignment.
2015-01-21 08:55:45 -08:00
Andrzej Kapolka
10c4408d94 Slight stitching tweak. 2015-01-20 21:52:56 -08:00
Andrzej Kapolka
79e18b161d Simplification. 2015-01-20 18:42:40 -08:00
Andrzej Kapolka
35547a5a02 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-20 18:30:50 -08:00
Brad Hefta-Gaub
5a621ba015 Merge pull request #4141 from huffman/entity-list-updates
Entity list updates - sorting, search, style
2015-01-20 18:18:15 -08:00
Brad Hefta-Gaub
08e8694ae1 Merge pull request #4139 from AndrewMeadows/bispinor
lower cost when failing to add entity to physics engine
2015-01-20 18:17:35 -08:00
Andrzej Kapolka
460a307ebe Better stitching. 2015-01-20 18:12:00 -08:00
Philip Rosedale
e95cd30be6 better reticle, balls drop properly on table 2015-01-20 16:30:50 -08:00
Stephen Birarda
25805cbe78 initial connection of Android client to audio mixer 2015-01-20 16:02:36 -08:00
Stephen Birarda
e4a9e429e0 reset NodeList if there is domain silence 2015-01-20 15:48:38 -08:00
Stephen Birarda
466ea12d0f turn off verbose HTTP request debug 2015-01-20 15:44:14 -08:00
Stephen Birarda
16dbc8048f inital connection of android client to domain 2015-01-20 15:40:34 -08:00
Stephen Birarda
a3a1350676 repairs to QInputDialog placement 2015-01-20 15:22:30 -08:00