Ryan Huffman
652543cdca
Update _scriptEngineHash to work with duplicate running scripts
2014-06-24 11:46:35 -07:00
Ryan Huffman
108fa36d24
Disable the ability to load a script multiple times
...
It won't show up correctly in running scripts, and can cause it to end up running
in the background unnoticed.
Also added an error message for when a script doesn't load.
2014-06-20 16:32:42 -07:00
Ryan Huffman
7a08ac76d2
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/src/Menu.cpp
interface/ui/preferencesDialog.ui
2014-06-17 20:27:16 -07:00
Ryan Huffman
0877f9f159
Fix issues with running scripts window on Windows
...
Replace running scripts table with a new widget that uses a proper
layout that doesn't rely on hard-coded sizing. Custom painted lines
were replaced with a horizontal QFrame line.
2014-06-17 20:19:49 -07:00
Brad Hefta-Gaub
d6f1cea1f5
Merge pull request #3040 from Atlante45/dont_select_models_too_big
...
if model takes too much angular size, don't select it
2014-06-17 19:12:20 -07:00
Atlante45
97dd695213
if model takes too much angular size, don't select it
2014-06-17 18:32:45 -07:00
Brad Hefta-Gaub
a51d2deec6
Merge pull request #3039 from Atlante45/snapping_model_rotation
...
Added snapped/smoothed rotation for models + tooltip
2014-06-17 17:42:25 -07:00
Brad Hefta-Gaub
dead474e6b
Merge pull request #3034 from Barnold1953/OculusOverlay
...
New Oculus Magnification Windows
2014-06-17 17:29:09 -07:00
Brad Hefta-Gaub
cee6f1be6a
Merge pull request #3031 from stojce/19755
...
Code Review for Job #19755
2014-06-17 17:28:55 -07:00
Atlante45
4467ee266d
Added snapped/smoothed rotation for models + tooltip
2014-06-17 17:19:16 -07:00
barnold1953
64725dd21b
Unneeded comment
2014-06-17 17:15:43 -07:00
barnold1953
fa32ad5b11
De-janked code by removing magic numbers
2014-06-17 17:14:26 -07:00
barnold1953
9f66eeb37f
Added a const variable for readability
2014-06-17 16:48:06 -07:00
barnold1953
7cbb19551a
Switched time query method and fixed horrifying bug
2014-06-17 16:38:19 -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
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
barnold1953
6c74650552
Attempt to fix build errors
2014-06-17 15:40:11 -07:00
Stojce Slavkovski
591ab448a1
remove unused variable
2014-06-17 23:54:55 +02:00
Stojce Slavkovski
9824072300
remove unused parameter in AccountScriptingInterface::updateBalance
2014-06-17 23:51:02 +02: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
barnold1953
bee84a064c
Dont render red border for mouse magnifier
2014-06-17 12:41:53 -07:00
Andrew Meadows
f18864bd72
Moved findRayIntersection() to the Shape classes
2014-06-17 12:36:36 -07:00
barnold1953
2eda35ff1d
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-06-17 12:25:09 -07:00
barnold1953
e775d645a7
Fixed NAN error with magnification windows
2014-06-17 12:19:15 -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
barnold1953
7bb8e4d571
Animated magnification opening and closing
2014-06-17 11:20:02 -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
barnold1953
dc663dedf8
Fixed compiler warnings
2014-06-17 10:45:59 -07:00
Atlante45
f367e1840d
Added a detached mode by default in inpect.js
2014-06-17 10:37:35 -07:00
barnold1953
3052996a9e
Pressing trigger and bumper at same time toggles UI
2014-06-17 10:37:15 -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
Brad Hefta-Gaub
5b62733a36
Merge pull request #3025 from talentraspel/19753
...
replaced usleep for windows
2014-06-16 17:40:01 -07:00
barnold1953
b0e89c5810
Made magnification use only button 3
2014-06-16 17:34:18 -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
barnold1953
2b374470b0
Allow clicking on magnified controls
2014-06-16 15:24:53 -07:00
