stojce
6d38904adb
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
2014-09-04 20:06:55 +02:00
Stephen Birarda
2678bd3d9e
Merge pull request #3348 from ZappoMan/virtualEntities
...
patch for possible static memory corruption on large edit entity messages
2014-09-04 10:48:59 -07:00
Brad Hefta-Gaub
0d69122ec1
Merge pull request #3344 from huffman/19944
...
Code Review for Job #19944
2014-09-04 10:25:53 -07:00
Brad Hefta-Gaub
02af53c8e8
Merge pull request #3349 from AndrewMeadows/inertia
...
fix for bad avatar bounding shape on resize
2014-09-04 10:25:27 -07:00
Andrew Meadows
1e19566e93
fix for bad avatar bounding shape on resize
2014-09-04 09:53:07 -07:00
ZappoMan
957991b67e
patch for possible static memory corruption on large edit entity messages
2014-09-04 09:52:26 -07:00
Brad Hefta-Gaub
100f9c9ac4
Merge pull request #3347 from birarda/domain-connect-debug
...
add debug to show that domain connection is being attempted
2014-09-04 09:30:29 -07:00
Stephen Birarda
e338c600c3
add debug to show that domain connection is being attempted
2014-09-04 09:29:29 -07:00
Philip Rosedale
cdaf59c962
Merge pull request #3346 from ZappoMan/virtualEntities
...
More Entities work
2014-09-03 20:09:36 -07:00
ZappoMan
68d2be97f7
formatting fixes
2014-09-03 19:46:33 -07:00
ZappoMan
be7a03b97e
flock of butterflies as entities
2014-09-03 19:41:53 -07:00
ZappoMan
31716697c0
new example script
2014-09-03 18:35:09 -07:00
ZappoMan
3e1401014d
more model naming cleanup and fixing example scripts
2014-09-03 18:32:44 -07:00
ZappoMan
5b8be780a7
add color to sphere property editor
2014-09-03 18:03:00 -07:00
Brad Hefta-Gaub
21c7a7c8a7
Merge pull request #3345 from ZappoMan/virtualEntities
...
remove assert in favor of warning
2014-09-03 17:38:07 -07:00
ZappoMan
e680260c89
remove assert in favor of warning
2014-09-03 17:17:36 -07:00
ZappoMan
d89b29581b
remove assert in favor of warning
2014-09-03 17:14:34 -07:00
AndrewMeadows
8223481ecb
Merge pull request #3341 from huffman/19967
...
Code Review for Job #19967
2014-09-03 16:51:19 -07:00
AndrewMeadows
9036954d38
Merge pull request #3311 from huffman/fix-wm-close
...
Update assignment client to close on WM_CLOSE message on Windows
2014-09-03 16:43:12 -07:00
stojce
f07f270dee
restore default buttons events
2014-09-04 01:22:17 +02:00
stojce
f12f45adec
Layout fixes
2014-09-04 00:55:36 +02:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
ZappoMan
d08e7ef96d
fix bug in way too small entities
2014-09-03 15:20:42 -07:00
Andrzej Kapolka
f33a33401f
Merge pull request #3338 from Atlante45/rec_file_format_tweaks
...
AC playback control scripts
2014-09-03 15:05:20 -07:00
Clément Brisset
72af7617fa
Merge pull request #3332 from AndrewMeadows/ragdoll
...
add AACubeShape to ShapeCollider
2014-09-03 14:34:32 -07:00
Stephen Birarda
4554a89754
Merge pull request #3340 from MarcelEdward/hifi-19916
...
Hifi 19916
2014-09-03 14:20:13 -07:00
stojce
e5e2960826
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
2014-09-03 22:29:12 +02:00
ZappoMan
76511762dc
fix bug in getContainingElement() found by andrew, allow sciprting interface to return properties of local only entities
2014-09-03 13:14:06 -07:00
ZappoMan
756840d541
CR feedback
2014-09-03 12:48:39 -07:00
ZappoMan
29bbeadbc7
fix method names for CR feedback
2014-09-03 12:44:57 -07:00
ZappoMan
ca3cf6d517
removed dead code
2014-09-03 12:42:51 -07:00
ZappoMan
59d0bb29a2
useless semicolon removal
2014-09-03 12:28:35 -07:00
ZappoMan
9a02545d9e
useless semicolon removal
2014-09-03 12:26:05 -07:00
ZappoMan
25e8c7d3f1
useless semicolon removal
2014-09-03 12:22:02 -07:00
ZappoMan
f5b9fabdb9
fix CR feedback
2014-09-03 12:12:08 -07:00
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
