Commit graph

16409 commits

Author SHA1 Message Date
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
Ryan Huffman
d4ebe577df Remove commented out icons 2014-09-03 08:28:25 -07:00
Ryan Huffman
5937830443 Update getWindowTitleBarHeight signature 2014-09-03 08:27:18 -07:00
ZappoMan
0acbefb6a2 fix but in getMyChildContaining and performance improvement to moving entities 2014-09-03 08:06:42 -07:00
Ryan Huffman
1ee23a1661 Add Windows.h include to ShutdownEventListener 2014-09-03 08:04:39 -07:00
MarcelEdward
9662dced09 This patch updates the MyAvatar.cpp file.
It adds a check MyAvatar::goToLocationFromResponse to see if the user is online, if the teleport to the avatar is done and if not a message is shown which said that the user is not online
2014-09-03 16:59:00 +02:00
MarcelEdward
e62834c197 This patch updates Application::updateLocationInServer() in Application.cpp
The online status is updated when the position is send to the data web, a avatar gets an offline status if the data web did not get an update in the last 30 seconds.
This function had an LastLocationObject in which only send in the location info to the data web in case the location changed.

Removed the last location so the position of the avatar is send to the data web every 5 seconds, so that the online status remains online if the avatar is still online and does not switch to offline when the avatar does not move.
2014-09-03 16:43:39 +02:00
MarcelEdward
95cab15864 the command:
cmake . -GXcode

creates a CMakeFiles direcory in the test directory, causing the creation of the xcode files to fail with an the source directory does not contain a CMakeList.txt file.

This patch updates the CMakeList.txt file in the test directory to ignore that created dir.
2014-09-03 16:34:23 +02:00
Ryan Huffman
f3efbb35f4 Remove nativeEventFilter from DomainServer 2014-09-03 07:08:51 -07:00
Ryan Huffman
76bede04aa Move stdout/err disabling to a library class 2014-09-03 07:06:08 -07:00
Ryan Huffman
c27bee2c06 Move wm_close handling to a shared library 2014-09-03 07:05:24 -07:00
ZappoMan
446daa81a5 fix issue of server clock skew changing without breaking animation and moving 2014-09-02 20:01:41 -07:00
ZappoMan
e8b1497d60 revert to old _lastUpdated behavior to fix animations and movement 2014-09-02 19:28:33 -07:00
ZappoMan
835071ab06 tweak rendering of model entities without valid models to be cubes 2014-09-02 19:21:15 -07:00
ZappoMan
9cf6fcdaab warning fix 2014-09-02 18:45:38 -07:00
ZappoMan
a555eeda23 CR feedback and warning fixes 2014-09-02 18:43:16 -07:00
Andrzej Kapolka
33faffd9d4 Sphere tools for voxel editing. 2014-09-02 17:45:37 -07:00
ZappoMan
9fa087571b tweak to save SVO logic 2014-09-02 17:10:41 -07:00
Andrew Meadows
7c04a25095 fix whitespace formatting of curly braces 2014-09-02 16:29:20 -07:00
Ryan Huffman
55acff02a1 Update RunningScripts height to take menu bar into account 2014-09-02 14:13:42 -07:00
Andrzej Kapolka
926f0d099c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-02 14:03:48 -07:00
Ryan Huffman
e6def6e35b Fix spacing on RunningScripts 2014-09-02 14:01:24 -07:00
Atlante45
5c88485eb9 Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-02 13:58:05 -07:00
Andrzej Kapolka
d9733be3e1 Merge pull request #3339 from ey6es/master
More shader fixes.
2014-09-02 13:57:31 -07:00
Andrzej Kapolka
34ba5cc31f More shader fixes. 2014-09-02 13:54:47 -07:00
Ryan Huffman
67cefc8d54 Reduce height of RunningScripts so titlebar is inside main window 2014-09-02 13:12:52 -07:00
Clément Brisset
54315e26a8 Merge pull request #3334 from ctrlaltdavid/19992
Code Review for Job #19992
2014-09-02 13:11:53 -07:00
Atlante45
049e0d763d Added ControlACs script 2014-09-02 12:57:19 -07:00
Atlante45
61467f7f3d Added ControlledAC script 2014-09-02 12:56:51 -07:00
Atlante45
a1e6d9e7a1 Protections against null pointers 2014-09-02 12:56:12 -07:00
Atlante45
872ec21822 Added removeLastTool() to toolBar.js 2014-09-02 12:55:15 -07:00
Ryan Huffman
a95b670716 Update RunningScripts style: font, spacing, title 2014-09-02 12:37:51 -07:00
Andrzej Kapolka
4e561c69b9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-02 12:32:57 -07:00
Andrzej Kapolka
d7a38e60b3 Merge pull request #3337 from ey6es/master
Quick fix for base colors underneath terrain.
2014-09-02 12:32:18 -07:00
Andrzej Kapolka
bf5e5fd72c Quick fix for base colors underneath terrain. 2014-09-02 12:31:25 -07:00
Andrzej Kapolka
50a250ce01 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-02 12:03:47 -07:00
ZappoMan
10d581925c DRY up the property reading code by using macro for repeated pattern 2014-09-02 10:31:26 -07:00
ZappoMan
799931aa6c DRY up the property setting code by using macro for repeated pattern 2014-09-02 09:30:28 -07:00
ZappoMan
033017346c removed debug code 2014-09-02 08:53:19 -07:00
ZappoMan
2b5d631290 removed a ton of old dead debug code 2014-09-02 08:44:43 -07:00
ZappoMan
0f2a14a359 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-09-02 07:52:51 -07:00
ZappoMan
fa5c2b9638 removed todo file 2014-09-01 23:09:18 -07:00
ZappoMan
ea22073ddc removed some accidentally added code 2014-09-01 23:05:23 -07:00
ZappoMan
f16a48e187 quiet some debugging 2014-09-01 22:38:18 -07:00
Ryan Huffman
ece3390b4e Fix bug with dropping hifi images not working on Windows
URLs on Windows included three forward-slashes, ex `file:///C:...`.
Using `toLocalFile()` correctly stringifies the location.
2014-09-01 22:14:28 -07:00
ZappoMan
b244e78af4 working on addressing issues with sibling cells and server clock skew causing some properties to be ignored 2014-09-01 21:48:03 -07:00
Clément Brisset
da96a4a458 Merge pull request #3333 from thoys/patch-1
Avatar.setLoop is now Avatar.setPlayerLoop
2014-09-01 21:18:08 -07:00
Ryan Huffman
9e510632b9 Remove box styling from RunningScripts 2014-08-31 12:29:54 -07:00
Ryan Huffman
936a9fad47 Disable icons on RunningScripts buttons 2014-08-31 12:28:45 -07:00
Ryan Huffman
2283b68dba Remove 'recently loaded' widgets from RunningScripts 2014-08-31 11:31:45 -07:00