DaveDubUK
ce31e586b0
fixed sounds. fixed constants
2015-06-25 12:40:51 +07:00
DaveDubUK
ececf68f06
Merge branch 'master' of https://github.com/highfidelity/hifi into walk-1.25
2015-06-25 12:15:07 +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
Anthony J. Thibault
c480c85f85
Fixes for switching between fullAvatar and head & body avatars while in first person.
...
Need to always add _skeletonModel to the main scene when switching to head/body avatar.
Need to always remove _firstPersonSkeletonModel from main scene when switching to head/body avatar.
2015-06-24 17:35:23 -07:00
Niraj Venkat
be053cfdc7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-24 17:33:57 -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
Niraj Venkat
d89ff2f720
Merge pull request #5188 from AlexanderOtavka/master
...
Improve address bar and edit.js entity properties list.
2015-06-24 16:48:24 -07:00
Atlante45
bc1abbe9b2
Update scripts
2015-06-24 16:45:38 -07:00
Atlante45
55c490043f
Restore InterfaceConfig.h includes
2015-06-24 16:13:42 -07:00
Atlante45
e3d22ef94b
Fix overlays getBounds + code cleanup
2015-06-24 16:13:42 -07:00
Brad Hefta-Gaub
0269e1eff1
Merge pull request #5204 from huffman/toolbar-titlebar
...
Add titlebar to toolbar and fix issue with draggable widgets not working (edit.js specifically)
2015-06-24 16:12:39 -07:00
Anthony J. Thibault
71639a7466
Fix for switching avatars while mirror is not enabled.
...
When the avatar is changed via set*URL, we need to set the associated model visibility appropriately.
This way when it gets added to the scene later in preRender, initWhenReady, it will render with the correct visibility settings.
2015-06-24 16:10:47 -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
b88d7c2e05
Added FIXME comment to preRender
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
8f03ead74e
Bug fix for two piece avatars.
...
The head was not rendering
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
Brad Hefta-Gaub
734a11e12a
Merge pull request #5199 from jherico/scale_rez_fix
...
Fixing misplaced UI on scale resolution
2015-06-24 16:10:33 -07:00
Atlante45
85b2771c4a
Extend Extents
2015-06-24 15:44:48 -07:00
Atlante45
233d92c315
Some code cleanup
2015-06-24 15:44:47 -07:00
Atlante45
31a98c5b40
Replace pos/rot by a transform in Base3DOverlay
...
Also keep getBounds a pure virtual methods
2015-06-24 15:44:47 -07:00
Atlante45
c22f1aa7e1
Overlay2D return correct getBounds
2015-06-24 15:44:46 -07:00
Atlante45
e8da8e374c
Simplify Overlays payloadGetBounds
2015-06-24 15:44:46 -07:00
Atlante45
6bb21b7a48
Use dynamic_pointer_cast instead of static_cast
2015-06-24 15:44:45 -07:00
Brad Hefta-Gaub
1cb7d0c1a5
Merge pull request #5194 from jherico/qml_warnings
...
Removing qml warnings
2015-06-24 15:42:36 -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
1ccd72d01e
Revert "Disable edit.js rotation text overlay temporarily"
...
This reverts commit b9ecff02f9
2015-06-24 15:32:32 -07:00
Sam Gondelman
19ec080e2b
Merge with master
2015-06-24 15:04:03 -07:00
bwent
0516caaa32
Added CHECK_PROPERTY_CHANGE macro
2015-06-24 14:58:33 -07:00
Philip Rosedale
0bef506be2
Merge pull request #5190 from jherico/mirror_zoom
...
Mirror zoom
2015-06-24 14:43:14 -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
Philip Rosedale
584ecf73af
Merge pull request #5196 from howard-stearns/toolbar-auto-persist-as-percentage-of-screen
...
Toolbar auto persist as percentage of screen
2015-06-24 14:29:27 -07:00
Ryan Huffman
54ee869d9b
Fix y position of toolbar
2015-06-24 14:04:53 -07:00
Ryan Huffman
666eaa81fe
Cleanup implementation of toolbar titlebar
2015-06-24 14:02:06 -07:00
Philip Rosedale
b7c64ef246
Merge pull request #5193 from SamGondelman/master
...
hydra dead zone to prevent drifting
2015-06-24 13:52:48 -07:00
DaveDubUK
0e71583048
code review changes for walk.js 1.25
2015-06-24 19:41:54 +07:00
DaveDubUK
73e59fe07f
code review changes for walk.js 1.25
2015-06-24 19:25:25 +07:00
DaveDubUK
c2287e9953
code review changes for walk.js 1.25
2015-06-24 19:24:57 +07:00
Howard Stearns
3b8a46b87d
Allow scripted audio injectors to have options set.
2015-06-23 21:01:34 -07:00
Howard Stearns
2e4c782626
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
2015-06-23 20:51:30 -07:00
Seth Alves
28582ed14d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 19:50:35 -07:00
Howard Stearns
4b4d8e4004
Merge branch 'master' of https://github.com/highfidelity/hifi into toolbar-auto-persist-as-percentage-of-screen
2015-06-23 19:36:49 -07:00
Zander Otavka
8c77fd369b
Add subsections to the edit.js properties list.
2015-06-23 17:40:38 -07:00
Andrew Meadows
1ceed98ca2
Merge pull request #5166 from jherico/64bit
...
Enable Windows 64 bit builds
2015-06-23 17:03:42 -07:00
Zander Otavka
05b668484c
Change address bar back/forward button color.
2015-06-23 16:41:15 -07:00
bwent
99cd9bada1
Added Billboard entity property and enabled billboarding for text entities
2015-06-23 16:22:34 -07:00
Brad Davis
fb2fb06371
Fixing misplaced UI on scale resolution, PC edition
2015-06-23 15:42:32 -07:00
Ryan Huffman
694a051724
Add titlebars to toolBars.js
2015-06-23 15:32:24 -07:00
Seth Alves
a46e8ed14c
quiet compiler
2015-06-23 15:27:35 -07:00
Seth Alves
0af137af36
save encoded action data rather than generating it on demand
2015-06-23 15:27:25 -07:00
