Andrzej Kapolka
9ded9b0696
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-17 17:07:38 -07:00
Andrzej Kapolka
758beff3d9
Make sure to use same enum streamer for the ones registered by type and the
...
ones registered by scope/name.
2014-06-17 17:06:28 -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
Andrzej Kapolka
c3090dd223
Tweak to the way streamers are written to JSON.
2014-06-17 16:12:06 -07:00
Brad Hefta-Gaub
6fc05d66c8
Merge pull request #3030 from AndrewMeadows/inertia
...
raycasts against Shapes
2014-06-17 16:10:36 -07:00
AndrewMeadows
5587d03c12
Merge pull request #3035 from ZappoMan/raypickbug
...
fixed a bug in inside out ray casting returning the wrong face
2014-06-17 15:49:17 -07: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
Andrzej Kapolka
7931173671
Working on tools to convert bitstreams to/from json.
2014-06-17 12:33:31 -07:00
Brad Hefta-Gaub
7362404aa2
Merge pull request #3032 from AndrewMeadows/say-no-to-warnings
...
remove build warnings
2014-06-17 12:17:44 -07:00
Brad Hefta-Gaub
9c27554f8a
Merge pull request #3028 from Atlante45/detached_mode_in_inspect_js
...
Added a detached mode by default in inpect.js
2014-06-17 12:15:00 -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
b37b9fb097
remove warnings about unused variables
2014-06-17 11:59:26 -07:00
Andrew Meadows
018ba52b1c
merge upstream/master with andrew/inertia
2014-06-17 10:50:49 -07:00
Andrew Meadows
fa6aed3e01
Add unit tests for ray intersections with shapes.
2014-06-17 10:49:53 -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
Atlante45
f367e1840d
Added a detached mode by default in inpect.js
2014-06-17 10:37:35 -07:00
Ryan Huffman
5843425db9
Fix scripts being loaded on start even if they don't exist
...
Application::loadScript should not store a reference to a script until
it has been successfully loaded. Previously if a script didn't exist it
would be "loaded" and show up in the running scripts window, but
wouldn't have been successfully loaded, and wouldn't be running anything
at all.
2014-06-17 09:18:58 -07:00
Andrzej Kapolka
37c977af02
Tests working for reading JSON.
2014-06-16 19:12:21 -07:00
Brad Hefta-Gaub
5b62733a36
Merge pull request #3025 from talentraspel/19753
...
replaced usleep for windows
2014-06-16 17:40:01 -07:00
Philip Rosedale
0084c36cd0
Merge pull request #3024 from Barnold1953/OculusOverlay
...
Exposed sixense mouse options and oculus UI angle to prefs
2014-06-16 16:42:33 -07:00
Andrzej Kapolka
77b6a209ab
More progress on json reading.
2014-06-16 14:51:22 -07:00
Kai Ludwig
d08b63b247
changed 2000 into a constant defined inline
2014-06-16 23:30:28 +02:00
Stephen Birarda
f84abeaa7b
Merge pull request #3027 from huffman/19779
...
Code Review for Job #19779
2014-06-16 11:51:17 -07:00
Ryan Huffman
9faf9d7749
Remove extra connect and disconnect for multipleDestinationsDecision
2014-06-16 11:43:04 -07:00
Ryan Huffman
a13810bd72
Merge branch 'master' of git://github.com/highfidelity/hifi into 19779
...
Conflicts:
interface/src/location/LocationManager.cpp
2014-06-16 11:35:55 -07:00
Ryan Huffman
978b7521db
Move connect call for multiple destinations to constructor
2014-06-16 11:30:47 -07:00
Brad Hefta-Gaub
e8a7c5dbb4
Merge pull request #3026 from Atlante45/model_support_for_inspect_js
...
Model support for inspect js
2014-06-16 11:03:32 -07:00
Atlante45
b3b3a72946
Disable editModels.js mouse events when ALT is pressed. (no conflict with inspect.js)
2014-06-16 10:55:34 -07:00
Atlante45
d5aa12db7d
Added models support to inspect.js
2014-06-16 10:55:05 -07:00
Ryan Huffman
af3b2a9d0f
Update LocationManager::goTo to use new addresses API
...
The new API address is now used for goTo when # or @ isn't present
Fixed the multiple locations popup to show when multiple locations are
found
2014-06-16 10:43:13 -07:00
barnold1953
031fe323ea
Got rid of some verbosity
2014-06-16 10:12:09 -07:00
barnold1953
94e58e9559
Fixed coding standard and made getCursorPixelRangeMultiplier more clear
2014-06-16 10:04:56 -07:00
Andrzej Kapolka
24ec441df7
Starting to work on JSON reading.
2014-06-15 17:57:09 -07:00
Andrzej Kapolka
3ec127afde
Spoke a little too soon.
2014-06-15 16:46:43 -07:00
Andrzej Kapolka
f4bd2a8beb
I think that basically covers the JSON writing portion.
2014-06-15 16:23:54 -07:00
Kai Ludwig
8c700d43f3
Modified CALLBACK_ACCELERATOR_RATIO for windows because some systems need larger input buffer to work fine.
2014-06-15 21:08:14 +02:00
Kai Ludwig
05900420a5
Replaced windows usleep version with a non busy waiting high accuracy version. This fixes the high CPU load for the windows servers too!
2014-06-15 21:07:03 +02:00
Kai Ludwig
3fbde70f96
Added functions to test usleep, msleep and sleep for accuracy.
2014-06-15 21:05:23 +02:00
Andrzej Kapolka
aac7459f42
More work on JSON encoding.
2014-06-13 18:32:57 -07:00
Andrzej Kapolka
7db05f2c8e
Working on JSON encoding.
2014-06-13 16:25:38 -07:00
barnold1953
bef625d237
Removed pointless Code
2014-06-13 16:14:03 -07:00
