Brad Hefta-Gaub
cee6f1be6a
Merge pull request #3031 from stojce/19755
...
Code Review for Job #19755
2014-06-17 17:28:55 -07:00
Brad Hefta-Gaub
df27de3c73
Merge pull request #3036 from huffman/19788
...
Code Review for Job #19788
2014-06-17 16:28:03 -07:00
Brad Hefta-Gaub
ba72410add
Merge pull request #3029 from thoys/interface-balance-display-fix
...
interface balance display fix
2014-06-17 16:25:07 -07:00
Brad Hefta-Gaub
41b3e3e4ea
Merge pull request #3023 from ey6es/metavoxels
...
Refactored type/object streaming, added support for reading into/writing from "generic" containers that don't require the original classes/types.
2014-06-17 16:24:22 -07:00
Brad Hefta-Gaub
6fc05d66c8
Merge pull request #3030 from AndrewMeadows/inertia
...
raycasts against Shapes
2014-06-17 16:10:36 -07:00
Stojce Slavkovski
8b5e3486a3
Merge branch 'master' of https://github.com/highfidelity/hifi into 19755
2014-06-17 23:22:03 +02:00
Ryan Huffman
89fbeb0b6d
Fix invalid remote scripts being loaded
2014-06-17 13:09:48 -07:00
ZappoMan
4413049302
fixed a bug in inside out ray casting returning the wrong face
2014-06-17 13:05:35 -07:00
Andrew Meadows
b6cecf3cfd
Add SphereShape.cpp to project
2014-06-17 12:50:49 -07:00
AndrewMeadows
c5bd3df046
Merge pull request #3033 from ZappoMan/raypickbug
...
add support for inside out ray intersection on AACube and AABox
2014-06-17 12:48:44 -07:00
Andrew Meadows
f18864bd72
Moved findRayIntersection() to the Shape classes
2014-06-17 12:36:36 -07:00
ZappoMan
9a3f8508cf
add support for inside out ray intersection on AACube and AABox
2014-06-17 12:12:53 -07:00
Andrew Meadows
3f36325642
remove warnings about signed/unsigned comparison
2014-06-17 11:59:37 -07:00
Andrew Meadows
018ba52b1c
merge upstream/master with andrew/inertia
2014-06-17 10:50:49 -07:00
Thijs Wenker
1e200c3b9c
The balance display didn't get over ~21.1 because the parsed json object int32 is maximal 2147483647, fixed this by parsing it from json to double.
2014-06-17 19:49:35 +02:00
Andrew Meadows
ab3d582d79
Add ray intersection tests against most shapes.
2014-06-17 10:49:14 -07:00
Andrew Meadows
e75340f8ce
Add PlaneShape::getNormal() method.
2014-06-17 10:48:29 -07:00
Kai Ludwig
d08b63b247
changed 2000 into a constant defined inline
2014-06-16 23:30:28 +02:00
Kai Ludwig
3fbde70f96
Added functions to test usleep, msleep and sleep for accuracy.
2014-06-15 21:05:23 +02:00
Stojce Slavkovski
f1e008853c
Merge branch 'master' of https://github.com/highfidelity/hifi into 19755
2014-06-15 12:36:14 +02:00
John Grosen
1a3de1ef28
Totally removed DataServerAccountInfo's JSON constructor
2014-06-13 15:01:20 -07:00
Andrzej Kapolka
10875c5e61
Fix for setID.
2014-06-13 12:12:17 -07:00
Andrzej Kapolka
8480f08816
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-13 12:01:08 -07:00
Andrzej Kapolka
9fc84d6358
Generics up and running.
2014-06-13 12:00:42 -07:00
John Grosen
3af4e32c81
Now determines hasProfile from presence of username
2014-06-13 11:08:38 -07:00
John Grosen
14f56310f6
Changed AccountManager to only rely on a proper OAuth response.
...
This involved making another request after the initial OAuth authorization.
Because of this now-two-step process, some methods and signals were renamed
to make their purpose more clear. Additionally, a _hasProfile member variable
was added to DataServerAccountInfo in order to allow for knowledge of whether
the profile elements had been fetched when being deserialized from disk.
Error handling for the whole process is still nonexistant.
2014-06-12 23:28:43 -07:00
Andrzej Kapolka
9e151001e0
More object streaming refactory.
2014-06-12 18:47:18 -07:00
John Grosen
f0cb49ef5c
added space between expressions in ternary operator
2014-06-12 17:24:56 -07:00
John Grosen
8e74398ed7
Fixed command line args parsing bug
2014-06-12 17:06:59 -07:00
Andrzej Kapolka
b4bd774789
Midpoint on generic object streaming.
2014-06-12 16:22:32 -07:00
Stojce Slavkovski
1959768513
Merge branch 'master' of https://github.com/highfidelity/hifi into 19755
2014-06-13 00:45:06 +02:00
Stephen Birarda
d689c6b39f
fix reference to attribute in STUN packet
2014-06-12 13:15:54 -07:00
Andrzej Kapolka
056db4ba7d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-12 11:45:51 -07:00
Andrzej Kapolka
6c98248e50
More progress on generics.
2014-06-11 18:30:01 -07:00
Andrzej Kapolka
6260d661f3
More work on generic containers.
2014-06-11 16:54:35 -07:00
wangyix
7aef5edb8f
removed debug var
2014-06-11 15:27:24 -07:00
wangyix
0601c24b24
removed debug prints
2014-06-11 15:26:22 -07:00
wangyix
ac0b037f0f
removed connect(); put call into Application::nodeKilled
...
OctreePacketReceiver::nodeKilled() doesn't get called when
NodeList::nodeKilled() is emitted for some unknown reason
2014-06-11 15:25:00 -07:00
Andrzej Kapolka
c045595ccb
More progress on refactoring.
2014-06-11 14:25:45 -07:00
Andrzej Kapolka
a529bc7e28
Refactoring.
2014-06-11 13:40:12 -07:00
wangyix
2080cc3dee
removed debug variable
2014-06-11 11:59:15 -07:00
wangyix
decd6109fb
made nodeKilled signatures match
2014-06-11 11:57:54 -07:00
Andrzej Kapolka
6b48554fdd
Added explanatory comment.
2014-06-11 11:26:21 -07:00
Andrzej Kapolka
92b5d6037d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-11 11:19:21 -07:00
wangyix
760627003f
killNode() to nodeKilled()
2014-06-11 11:11:04 -07:00
wangyix
fc07ceb412
added killNode() slot for _packetCounts garbage collection
2014-06-11 10:54:44 -07:00
wangyix
01005dc792
Merge remote-tracking branch 'upstream/master'
2014-06-11 10:09:49 -07:00
AndrewMeadows
49a33ff46a
Merge pull request #3006 from ey6es/metavoxels
...
Streaming/delta-streaming for script values.
2014-06-11 09:25:39 -07:00
Andrzej Kapolka
9aa152f43f
More TypeReader refactoring progress.
2014-06-10 18:29:21 -07:00
Andrzej Kapolka
69899f4d37
Edging towards generic container types.
2014-06-10 16:53:00 -07:00
