Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Brad Davis
8dcd91fdab
Merge pull request #5192 from venkatn93/master
...
Hyperlink tooltip and address bar remodel
2015-06-26 10:28:52 -07:00
Seth Alves
015498a6e0
move function up so this builds in non-debug mode
2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d
fix alt-branch of ifdef
2015-06-26 07:04:10 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Niraj Venkat
6b14a64c8c
Formatting changes and teleport on click
2015-06-25 15:15:44 -07:00
Brad Hefta-Gaub
6c4a4866d3
Merge pull request #5202 from Atlante45/overlay
...
Overlay have correct bounds
2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub
77bbb23a1e
Merge pull request #5175 from hyperlogic/ajt/first-person-avatar
...
Render a different model when in first person view.
2015-06-24 18:54:47 -07:00
Clément Brisset
e05b4e3115
Merge pull request #5203 from howard-stearns/set-injector-options-from-script
...
Set injector options from script
2015-06-24 16:54:11 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Atlante45
85b2771c4a
Extend Extents
2015-06-24 15:44:48 -07:00
Clément Brisset
6db4184748
Merge pull request #5171 from huffman/fix-edit-rotate
...
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Howard Stearns
3b8a46b87d
Allow scripted audio injectors to have options set.
2015-06-23 21:01:34 -07:00
ericrius1
b1190bee6e
deleted empty files I accidently committed.
2015-06-23 14:13:13 -07:00
Seth Alves
4bf4e9f5da
Merge pull request #5164 from ericrius1/lineBounds
...
Line bounds
2015-06-23 10:47:38 -07:00
Brad Hefta-Gaub
a3e1987078
Merge pull request #5176 from huffman/fix-raypicking-crash
...
DO NOT MERGE - Fix recalculateMeshBoxes being called outside of mutex
2015-06-22 19:03:31 -07:00
Brad Hefta-Gaub
e0f9f8b613
Merge pull request #5183 from birarda/ac-scripts
...
fix AC crash with no controller scripting interface
2015-06-22 17:22:56 -07:00
Philip Rosedale
6ef7e486b1
Merge pull request #5165 from ctrlaltdavid/20582
...
CR for #20582 - Fix the issue with Domain backups
2015-06-22 17:02:38 -07:00
Brad Davis
98f7b0a689
Merge pull request #5181 from birarda/master
...
fix for double store on index path lookup
2015-06-22 13:58:36 -07:00
Howard Stearns
240272be11
Merge pull request #5161 from PhilipRosedale/master
...
Always test and remove DC Offset
2015-06-22 12:09:08 -07:00
Philip Rosedale
111b0f286d
Merge pull request #5160 from ctrlaltdavid/addressbar-tidy
...
Tidy address bar code
2015-06-22 12:08:33 -07:00
Philip Rosedale
e5c1e0ca67
Merge pull request #5159 from howard-stearns/refactor-playSound
...
Refactor playSound
2015-06-22 12:07:08 -07:00
Stephen Birarda
ff21c22245
fix AC crash with no controller scripting interface
2015-06-22 11:56:07 -07:00
Stephen Birarda
a9eccb687a
fix for double store on index path lookup
2015-06-22 11:26:17 -07:00
ericrius1
362d9a2481
syncing brush sphere with line color
2015-06-22 10:35:00 -07:00
Brad Davis
3231bbba5a
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-22 09:44:16 -07:00
Brad Davis
1b44c220a7
Prep work for procedural stars & stuff
2015-06-22 09:43:12 -07:00
samcake
be8ae9580d
Merge pull request #5177 from bwent/doubleClickEvent
...
Expose mouseDoublePressEvents to js
2015-06-22 11:13:05 +02:00
Bradley Austin Davis
4ccdc78866
Fixing frustum perspective bug
2015-06-21 15:53:24 -07:00
Bradley Austin Davis
577962cb67
Merge branch 'master' into overlay
2015-06-20 10:37:55 -07:00
ericrius1
dbec1aad0c
line entity points are now local to entity position. Changed paint script to reflect this
2015-06-19 18:54:28 -07:00
David Rowe
0b13accf94
Merge branch 'master' into addressbar-tidy
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2015-06-19 17:42:27 -07:00
Ryan Huffman
1371f775ee
Add mutex lock around access to Model::_calculatedMeshPartOffset
2015-06-19 16:51:13 -07:00
Ryan Huffman
a7f291154b
Add lock around recalculateMeshPartOffsets call
2015-06-19 16:28:58 -07:00
Niraj Venkat
482f12be8c
Returning ref to stack to view controller
2015-06-19 16:05:45 -07:00
bwent
c315bcec24
Expose mouseDoublePressEvents to js
2015-06-19 15:52:27 -07:00
Ryan Huffman
1734d5e584
Fix recalculateMeshBoxes being called outside of mutex
2015-06-19 15:05:55 -07:00
Brad Davis
cc6b589ae5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-19 14:48:38 -07:00
Howard Stearns
7cf7f0df1a
Remove #include that was introduced in version 1 that is not needed in final.
2015-06-19 14:38:43 -07:00
Howard Stearns
b506fe0f1d
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
2015-06-19 14:22:04 -07:00
Howard Stearns
dc10e15e96
Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client.
2015-06-19 14:20:00 -07:00
Niraj Venkat
054e12a315
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-19 11:22:50 -07:00
Niraj Venkat
1494aa4faa
Adding new icon and getters
2015-06-19 11:18:16 -07:00
Ryan Huffman
35f9d49c06
Fix DrawOverlay3D::getOpaquePipeline invalid signature
2015-06-19 10:47:25 -07:00
Ryan Huffman
665baff665
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
...
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2
Move circle3d and text overlays to batches
2015-06-19 09:45:13 -07:00
Sam Gateau
873955b17e
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-06-19 18:02:56 +02:00
Clément Brisset
5192796851
Merge pull request #5168 from samcake/daft
...
Improving the rendering job architecture
2015-06-19 18:00:39 +02:00
