Andrew Meadows
7cde6811ca
remove unecessary AACube::operator<()
2014-09-04 15:21:19 -07:00
Andrew Meadows
faf31f268e
use QHash, not QVector, for Octree content query
2014-09-04 15:20:07 -07:00
Andrew Meadows
e120697a9b
merge upstream/master into andrew/ragdoll
2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
Andrew Meadows
a3b26582ba
fix for nan in sphereVsAACubeHelper()
2014-09-03 15:39:26 -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
Andrew Meadows
4270c4d989
merge upstream/master into andrew/ragdoll
2014-09-03 14:42:17 -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
Andrew Meadows
2c1aa31d1e
give MyAvatar a VoxelShapeManager member
2014-09-03 13:19:41 -07:00
Andrew Meadows
83e04a0e8f
add VoxelShapeManager class
2014-09-03 13:19:14 -07:00
Andrew Meadows
361d1e83b0
use PhysicsEntity::stepForward() in simulation loop
2014-09-03 13:18:35 -07:00
Andrew Meadows
6454fd2627
add PhysicsEntity::stepForward()
2014-09-03 13:18:12 -07:00
Andrew Meadows
54463ab668
add findContentInCube() and typedef CubeList
2014-09-03 13:17:47 -07:00
Andrew Meadows
06e1d4a8bc
init Shape::_mass in all ctors
2014-09-03 13:16:49 -07: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
Andrew Meadows
0cc6f559d4
add AACube::operator<() so they can be sorted
2014-09-03 13:13:54 -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
ZappoMan
0acbefb6a2
fix but in getMyChildContaining and performance improvement to moving entities
2014-09-03 08:06:42 -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
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
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
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
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
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
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
