Brad Hefta-Gaub
|
20bc32fc89
|
Merge pull request #9980 from birarda/bug/ac-agent-audio
make sure the AC agent has an AudioScriptingInterface
|
2017-03-23 15:13:24 -07:00 |
|
Zach Fox
|
a231b57472
|
Merge pull request #9962 from birarda/cmake-with-space
Fix failing POST_BUILD steps on Windows with spaces in build path
|
2017-03-23 11:41:38 -07:00 |
|
samcake
|
73227f6598
|
Merge pull request #9958 from highfidelity/smarter_textures
New texture streaming system
|
2017-03-23 09:44:31 -07:00 |
|
Stephen Birarda
|
b53cb5934b
|
make sure the AC agent has an AudioScriptingInterface
|
2017-03-22 23:35:29 -07:00 |
|
Brad Davis
|
3a40fd886f
|
Fix comparison between GL stamps and GPU stamps
|
2017-03-22 18:11:20 -07:00 |
|
Brad Davis
|
4868a1618a
|
Add initialization to sampler stamp
|
2017-03-22 18:10:54 -07:00 |
|
Brad Davis
|
893fcba283
|
Return the correct format and internal format combo for depth textures
|
2017-03-22 17:14:40 -07:00 |
|
Brad Davis
|
9a3686fc1a
|
Fixing merge conflict
|
2017-03-22 14:55:11 -07:00 |
|
Brad Davis
|
85c80f3be8
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
|
2017-03-22 14:25:23 -07:00 |
|
Andrew Meadows
|
a463013d90
|
Merge pull request #9960 from samcake/blue
Fix Ambient Lighting equation
|
2017-03-22 14:13:31 -07:00 |
|
Chris Collins
|
05c40d2930
|
Merge pull request #9933 from mittens/hotfix/obj-texture-fix
Fixed the texture assignment for the OBJ loader
|
2017-03-22 13:19:01 -07:00 |
|
Ryan Huffman
|
1285f2a9eb
|
Merge pull request #9937 from thoys/boppo
El Boppo the Clown punching bag game
|
2017-03-22 09:30:54 -07:00 |
|
Thijs Wenker
|
dff67886d0
|
CR Changes - remove double constructor, use creation function instead
|
2017-03-22 17:28:10 +01:00 |
|
Brad Davis
|
e60108cc8c
|
PR comments
|
2017-03-21 17:26:24 -07:00 |
|
Brad Davis
|
a3828ce45c
|
Fixing comment
|
2017-03-21 13:42:24 -07:00 |
|
Chris Collins
|
4c789c44aa
|
Merge pull request #9922 from birarda/bug/stuck-ess
fix a couple of ESS issues during ES/ESS restart
|
2017-03-21 12:44:53 -07:00 |
|
Ryan Huffman
|
13222468e3
|
Merge pull request #9712 from huffman/feat/edit-particle-icon
Add particle system overlay in edit.js
|
2017-03-21 10:02:52 -07:00 |
|
Andrew Meadows
|
b2abe5aa04
|
Merge pull request #9956 from mittens/master
Tweaks to the Physics Simulation Ownership Icon Rendering
|
2017-03-21 09:29:50 -07:00 |
|
Brad Hefta-Gaub
|
ac309df3d1
|
Merge pull request #9946 from sethalves/model-scripting-1
Model scripting
|
2017-03-21 09:26:32 -07:00 |
|
Chris Collins
|
3f30909579
|
Merge pull request #9961 from Atlante45/feat/delete_dead_code
Delete old sitting points code
|
2017-03-21 08:03:46 -07:00 |
|
Chris Collins
|
ea13151d55
|
Merge pull request #9945 from mnafees/21233
21233: Remove Scripts Editor option from Edit menu and all related files
|
2017-03-21 08:01:36 -07:00 |
|
Zach Pomerantz
|
b6d111369f
|
Merge pull request #9935 from zzmp/fix/audio-initialization
Fix data race in audio output initialization
|
2017-03-21 00:23:28 -04:00 |
|
Zach Pomerantz
|
20ea13e00a
|
Merge pull request #9897 from zzmp/record/noise-gate
Add AudioNoiseGate to recordings played through Interface
|
2017-03-21 00:21:20 -04:00 |
|
Stephen Birarda
|
c9d1916eea
|
fix for build with win path with spaces
|
2017-03-20 18:24:19 -07:00 |
|
Atlante45
|
73dd2abdaf
|
Delete old sitting points code
|
2017-03-20 17:29:44 -07:00 |
|
samcake
|
e05abf2a2f
|
Fixing the spherical harmonics gneration
|
2017-03-20 16:41:21 -07:00 |
|
Brad Davis
|
e482eac437
|
Merge remote-tracking branch 'upstream/master' into smarter_textures
|
2017-03-20 16:22:13 -07:00 |
|
samcake
|
5a6478c660
|
Merge pull request #9952 from jherico/smarter_textures
Return existing textures when matching hash for a previously found live texture
|
2017-03-20 15:48:52 -07:00 |
|
samcake
|
03e1c5e0f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-03-20 15:10:09 -07:00 |
|
trent
|
3b8636b75c
|
Doubled-ish the size of the physics status icons, fixed texture coordinates to be right-side up.
|
2017-03-20 17:55:52 -04:00 |
|
Stephen Birarda
|
96cf6b8c04
|
fix clear check for missing other entity servers
|
2017-03-20 13:40:15 -07:00 |
|
Stephen Birarda
|
0a118bd268
|
add a guard for trading entity servers by checking node count
|
2017-03-20 13:40:15 -07:00 |
|
Stephen Birarda
|
c63a2c9cda
|
remove requirement of ScriptEngine in ScriptEngines slots
|
2017-03-20 13:40:15 -07:00 |
|
Stephen Birarda
|
a4d72c4e67
|
make AudioScriptingInterface a Dependency
|
2017-03-20 13:40:15 -07:00 |
|
Stephen Birarda
|
20022ebdc8
|
use deleteLater for ESS script engine on nodeKilled
|
2017-03-20 13:38:59 -07:00 |
|
Andrew Meadows
|
92e3f8768c
|
Merge pull request #9921 from jherico/menu_fix
Fix possible crash in Menu::removeSeparator
|
2017-03-20 13:38:36 -07:00 |
|
Chris Collins
|
e7a90636d6
|
Merge pull request #9949 from anshuman64/patch-1
New simplified, stand-alone build guide for Windows
|
2017-03-20 11:41:07 -07:00 |
|
Brad Hefta-Gaub
|
bc5d7d8698
|
Merge pull request #9851 from AndrewMeadows/simulation-ownership-2
zero velocity of deactivated dynamic entities
|
2017-03-20 10:20:11 -07:00 |
|
Brad Hefta-Gaub
|
ccce4b4d29
|
Merge pull request #9948 from sethalves/fix-obj-with-no-material
fix obj sans material
|
2017-03-20 10:09:36 -07:00 |
|
Brad Hefta-Gaub
|
af790d8474
|
Merge pull request #9875 from birarda/bug/spin-strafe
fix double snap turn strafing
|
2017-03-20 10:08:05 -07:00 |
|
Chris Collins
|
af2748410d
|
Merge pull request #9932 from Triplelexx/21231
21231 - Remove About Interface from File menu
|
2017-03-20 09:55:57 -07:00 |
|
Chris Collins
|
509057c6d8
|
Merge pull request #9941 from Triplelexx/21232
21232 - Remove Mini Mirror from View menu
|
2017-03-20 09:55:37 -07:00 |
|
Ryan Huffman
|
df644edde4
|
Fix hand controller not able to select light/particle icons
|
2017-03-20 09:45:50 -07:00 |
|
Brad Davis
|
14c8c3f4db
|
Return existing textures when matching hash for a previously found live texture
|
2017-03-20 09:39:29 -07:00 |
|
Chris Collins
|
ed27c550af
|
Merge pull request #9939 from ctrlaltdavid/21237
Disable Developer > Assets > ATP Asset Migration menu item
|
2017-03-20 06:29:33 -07:00 |
|
Chris Collins
|
2e6291f470
|
Merge pull request #9929 from ctrlaltdavid/21235
Replace Developer > Network > Disk cache editor with menu action
|
2017-03-20 06:26:36 -07:00 |
|
Chris Collins
|
308c134119
|
Merge pull request #9686 from humbletim/21114-part3
CR 21114 -- Implement modules/require support into hifi
|
2017-03-20 06:22:35 -07:00 |
|
Sam Cake
|
a804bc723f
|
Keep pushing and debugging ambient lighting
|
2017-03-20 00:32:06 -07:00 |
|
Mohammed Nafees
|
c460523980
|
Remove related icon files for Scripts Editor
|
2017-03-20 00:25:50 -04:00 |
|
Mohammed Nafees
|
3612b9fccc
|
Remove Edit > Scripts Editor and all related source files
|
2017-03-20 00:25:50 -04:00 |
|