Commit graph

14226 commits

Author SHA1 Message Date
Atlante45
2015861e13 Fixed spelling mistake 2014-06-30 20:10:53 -07:00
Atlante45
7c797449ab Comments + connectedDevice 2014-06-30 19:02:43 -07:00
Atlante45
1a2fd4483b Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 2014-06-30 17:54:34 -07:00
Atlante45
d4ed9d4573 Removed preprocessor statements 2014-06-30 17:52:05 -07:00
Atlante45
780e669fbb fix for jenkins failure 2014-06-30 17:46:19 -07:00
Atlante45
d102795314 Added application version to logger 2014-06-30 17:18:49 -07:00
Atlante45
f33ad8a100 Adding logger calls 2014-06-30 17:10:17 -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
Clément Brisset
33a01f7026 Merge pull request #3100 from ZappoMan/fixOctreeServerCrashInSendNack
fix crash in SendNack on server shutdown
2014-06-30 16:12:47 -07:00
Atlante45
e9dffc0681 Removed testing code 2014-06-30 14:31:39 -07:00
Atlante45
ff8694d5c5 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity 2014-06-30 14:30:17 -07:00
Atlante45
5e2ad7173c Added functions to logger 2014-06-30 14:27:53 -07:00
Atlante45
0d18debd1b Moved UserActivityLogger to networking 2014-06-30 14:27:07 -07:00
ZappoMan
687a81a223 fix crash in SendNack on server shutdown 2014-06-30 13:18:58 -07:00
Stephen Birarda
146cd2b59d update BUILD.md to remove zlib requirement 2014-06-30 12:23:33 -07:00
Clément Brisset
bd56596b59 Merge pull request #3096 from AndrewMeadows/bug-fix
fix for assert crash in SkeletonModel::initRagdollPoints()
2014-06-30 10:04:10 -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
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
Leonardo Murillo
af9d09427a Merge pull request #3088 from birarda/master
repairs so OAuth flow doesn't get stuck after error
2014-06-27 12:33:58 -07:00
Stephen Birarda
657bf6b3d5 repairs so OAuth flow doesn't get stuck after an error 2014-06-27 11:41:35 -07:00
Leonardo Murillo
21b839a8b5 Updating concertCamera script 2014-06-27 11:08:24 -07:00
Clément Brisset
04e2249413 Merge pull request #3087 from Atlante45/sit_on_a_model
make sitting points semi transparent
2014-06-27 10:56:46 -07:00
Clément Brisset
8c1e7fb0b5 Merge pull request #3086 from birarda/master
add HTTPS request debugging to domain-server
2014-06-27 10:56:35 -07:00
Atlante45
5bea267cd2 make sitting points semi transparent 2014-06-27 10:54:57 -07:00
Philip Rosedale
6e79fbdbdd Merge pull request #3085 from Atlante45/sit_on_a_model
Sit on a model
2014-06-27 10:52:57 -07:00
Stephen Birarda
8edc4bf9d1 add HTTPS request debugged to domain-server 2014-06-27 10:38:39 -07:00
Atlante45
43de421284 Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model 2014-06-27 10:07:02 -07:00
Atlante45
4281168fe9 Hide seat once you are seated 2014-06-27 10:03:50 -07:00
Atlante45
baf4a82269 Fix crash occuring when geometry not yet available 2014-06-27 09:56:03 -07:00
Atlante45
aad666be62 more sitting work 2014-06-27 09:48:27 -07:00
Stephen Birarda
ee2b5c2e3e Merge pull request #3084 from birarda/master
fix place lookup for new APIs
2014-06-27 09:37:27 -07:00
Stephen Birarda
bb44d8b478 fix place lookup for new APIs 2014-06-27 09:36:47 -07:00
Philip Rosedale
e47fb5750b Merge pull request #3083 from birarda/master
initial pass at settings in the domain-server passed down to audio-mixer
2014-06-27 09:26:01 -07:00
Stephen Birarda
3ae46bc60d switch audio-mixer to pull settings from domain-server via JSON request 2014-06-26 17:32:56 -07:00
Stephen Birarda
3f70402e63 fix odd encoding in settings URL 2014-06-26 16:58:51 -07:00
Stephen Birarda
95d266b305 initial setup of settings request from domain-server 2014-06-26 16:55:22 -07:00
Atlante45
e41d3f407b Removed nested lock 2014-06-26 16:40:59 -07:00
Stephen Birarda
731690e358 add querying for settings that affect a specific type 2014-06-26 16:29:44 -07:00
Stephen Birarda
ab50432ead use underscorejs templating for queued assignments 2014-06-26 15:45:31 -07:00
Stephen Birarda
e56f4aba0a use underscorejs for nodes table template 2014-06-26 15:40:10 -07:00
Atlante45
8d00a8d535 Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity
Conflicts:
	libraries/networking/src/LimitedNodeList.cpp
2014-06-26 14:56:15 -07:00