Commit graph

7170 commits

Author SHA1 Message Date
Atlante45
09cf01e097 ModelOverlay functionnal + bounding box 2014-07-01 12:42:56 -07:00
Andrzej Kapolka
0075bb89c4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 18:02:56 -07:00
Clément Brisset
1fd830f53c Merge pull request #3098 from ctrlaltdavid/19803
Code Review for Job #19803
2014-06-30 16:15:51 -07:00
Andrzej Kapolka
110f90df0e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-30 12:42:02 -07:00
Andrew Meadows
57c17eb972 remove unecessary clearRagdollConstraintsAndPoints() 2014-06-30 09:18:31 -07:00
Andrew Meadows
f33728b615 guarantee that ragdoll is clear before initialized 2014-06-30 09:13:42 -07:00
David Rowe
ce874305be Add checkbox that automatically reloads externally changed files 2014-06-29 21:50:16 -07:00
David Rowe
c454c790fa Check script file for external changes when editor regains focus
Prompt user whether to reload.
2014-06-29 21:31:28 -07:00
David Rowe
3df43dc653 Catch any on-the-fly modifications made while script is restarting 2014-06-29 20:13:27 -07:00
David Rowe
742007892f Rework old fix for Script Editor Script.stop() crash 2014-06-29 19:57:26 -07:00
David Rowe
48fb156e28 Fix Script Editor run-on-the-fly crashing
Wait for script engine to stop before restarting.
2014-06-29 19:47:00 -07:00
David Rowe
9449ad7192 Add missing script engine hash key code changes
The script engine hash key changed starting at commit [62f85d] on 11 Jun.
2014-06-29 19:40:53 -07:00
Andrzej Kapolka
4f9cf82335 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 17:53:50 -07:00
Clément Brisset
9eba4b01f0 Merge pull request #3092 from ctrlaltdavid/19789
Code Review for Job #19789
2014-06-27 17:28:48 -07:00
Clément Brisset
ae8997ec0d Merge pull request #3091 from AlericInglewood/master
Compiler warning fixes.
2014-06-27 15:36:13 -07:00
Aleric Inglewood
1bc2f214a5 Compiler warning fixes.
This fixes all warnings that I got while compiling with g++ 4.7.2:

 In file included from interface/src/Application.h:53:0,
                  from interface/src/Menu.cpp:36:
 interface/src/Menu.h: In constructor ‘Menu::Menu()’:
 interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder]
 interface/src/Menu.h:289:27: warning:   ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder]
 interface/src/Menu.cpp:82:1: warning:   when initialized here [-Wreorder]

 libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’:
 libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’:
 libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'.
 interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'.

 interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’:
 interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default]
 interface/src/avatar/Avatar.cpp:574:18: warning:   matches this ‘link’ under ISO standard rules [enabled by default]
 interface/src/avatar/Avatar.cpp:577:22: warning:   matches this ‘link’ under old rules [enabled by default]

 interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’:
 interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

 In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0:
 interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’:
 interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder]
 interface/src/ui/RunningScriptsWidget.h:60:27: warning:   ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder]
 interface/src/ui/RunningScriptsWidget.cpp:27:1: warning:   when initialized here [-Wreorder]
2014-06-27 22:18:38 +02:00
Andrzej Kapolka
61c2ea40ae Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-27 12:34:50 -07:00
Stephen Birarda
657bf6b3d5 repairs so OAuth flow doesn't get stuck after an error 2014-06-27 11:41:35 -07:00
Stephen Birarda
bb44d8b478 fix place lookup for new APIs 2014-06-27 09:36:47 -07:00
Andrzej Kapolka
7c046cb100 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-26 19:12:30 -07:00
Andrzej Kapolka
f16098daef Use the refactored endpoint/client classes in the actual client/server. 2014-06-26 19:11:54 -07:00
Andrzej Kapolka
4b2d122f3d Working on factoring out the common metavoxel endpoint/client code. 2014-06-26 16:12:11 -07:00
Mohammed Nafees
6be4633a97 Merge remote-tracking branch 'upstream/master' into 19801 2014-06-26 23:48:11 +05:30
Clément Brisset
463ac9cc74 Merge pull request #3078 from PhilipRosedale/master
Improved toy ball, JS calls for palm position, concertCamera.js
2014-06-26 11:03:48 -07:00
Clément Brisset
cd53b727d0 Merge pull request #3080 from AndrewMeadows/bug-fix
fix for avatar models with multiple roots
2014-06-26 10:54:03 -07:00
AndrewMeadows
dba9d33f86 Merge pull request #3075 from huffman/19644
Code Review for Job #19644
2014-06-26 09:39:20 -07:00
Andrew Meadows
0d18f2fbab fix for avatar models with multiple roots 2014-06-26 09:12:44 -07:00
Philip Rosedale
c72e41dcd2 added Oculus angular velocity, moved sit icon up 2014-06-25 22:27:54 -07:00
Philip Rosedale
93b131d520 Fix build warning from wrong init order 2014-06-25 15:41:47 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Andrzej Kapolka
6480c678d2 Disable strict aliasing for safe type punning, fix potentially uninitialized
variable warning.
2014-06-25 13:46:13 -07:00
David Rowe
9fb64386aa Fix stopping scripts in the script editor 2014-06-25 11:44:58 -07:00
Philip Rosedale
40dee3b39e Added JS calls for left/right estimated palm position on skeleton model, improved toy ball to use them 2014-06-25 05:24:22 -07:00
Philip Rosedale
88c01266ab more hair tweaks, don’t render in 1P, improved toy ball 2014-06-25 03:29:08 -07:00
Philip Rosedale
95a66a06af Merge branch 'master' of https://github.com/worklist/hifi 2014-06-25 02:57:54 -07:00
Ryan Huffman
3bec59fd33 Fix unindented line 2014-06-24 20:38:46 -07:00
Philip Rosedale
60c33c18c3 Expose mode shift period to JS, remove default value 2014-06-24 20:32:41 -07:00
Ryan Huffman
5ece424a45 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
Conflicts:
	interface/ui/runningScriptsWidget.ui
2014-06-24 20:27:44 -07:00
Clément Brisset
b6a8949b4c Merge pull request #3069 from binaryking/19765
Code Review for Job #19765
2014-06-24 17:49:42 -07:00
Stephen Birarda
5f4baaffa5 revert credit balance rounding 2014-06-24 16:25:41 -07:00
Philip Rosedale
81e7f8e0a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-24 16:21:35 -07:00
Philip Rosedale
9eb91e2b44 tweaking params 2014-06-24 16:15:16 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
Mohammed Nafees
d5d2107b97 Merge remote-tracking branch 'upstream/master' into 19765 2014-06-25 01:50:29 +05:30
Mohammed Nafees
7271f85041 Change font size values from pt to px in Chat Window. 2014-06-25 01:49:17 +05:30
Ryan Huffman
173be2c89d Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-24 12:01:04 -07:00
Ryan Huffman
f249020d6d Clean up redundant if statement 2014-06-24 11:50:54 -07:00
Ryan Huffman
89f43acb7f Add a tooltip with the full path to running scripts 2014-06-24 11:47:14 -07:00
Ryan Huffman
652543cdca Update _scriptEngineHash to work with duplicate running scripts 2014-06-24 11:46:35 -07:00
Philip Rosedale
556578b8dc first pass - hair as vertlet strands 2014-06-24 09:30:11 -07:00