David Rowe
|
8445c9fbc7
|
Update max window height before it scrolls, according to its position
|
2016-05-13 13:08:45 +12:00 |
|
Seth Alves
|
dd2a29aace
|
when a ModelEntityItem moves, also update its meta-render-item
|
2016-05-12 18:05:28 -07:00 |
|
Seth Alves
|
30fb9349c4
|
dry up some code
|
2016-05-12 17:52:40 -07:00 |
|
Zach Pomerantz
|
806d06b552
|
Wait on old entity script engines in threadpool
|
2016-05-12 17:51:40 -07:00 |
|
David Rowe
|
93ead174aa
|
Click and drag border to move users window
|
2016-05-13 12:51:39 +12:00 |
|
Zach Pomerantz
|
e1c130d02f
|
Timeout long sandbox scripts
|
2016-05-12 17:51:39 -07:00 |
|
Zach Pomerantz
|
1107882be2
|
Throw to stop non-evaluating scripts
|
2016-05-12 17:51:38 -07:00 |
|
Zach Pomerantz
|
7e82494a66
|
Add cap on entities scripting thread stop time
|
2016-05-12 17:51:37 -07:00 |
|
Zach Pomerantz
|
f2f89ca062
|
Add logging to ScriptEngine lifetime
|
2016-05-12 17:51:36 -07:00 |
|
Zach Pomerantz
|
f40fe88ee7
|
Clean up entity script engine deletion
|
2016-05-12 17:51:36 -07:00 |
|
Zach Pomerantz
|
2cc788f98d
|
Rename ScriptEngine::wait to match std threading
|
2016-05-12 17:51:35 -07:00 |
|
James B. Pollack
|
5442ffaf3e
|
glow light
|
2016-05-12 16:58:29 -07:00 |
|
James B. Pollack
|
d1d0bbdd26
|
tidy 2.0
|
2016-05-12 16:46:58 -07:00 |
|
Stephen Birarda
|
2cf943b2b1
|
remove billboard code from AvatarData
|
2016-05-12 16:41:44 -07:00 |
|
Stephen Birarda
|
aa226739d3
|
remove billboard code from Agent
|
2016-05-12 16:41:44 -07:00 |
|
howard-stearns
|
40f7212b1e
|
Make uses of getReticlePosition consistent with respect to window offset.
|
2016-05-12 16:37:03 -07:00 |
|
David Rowe
|
54d658798a
|
Add border overlay
|
2016-05-13 11:22:10 +12:00 |
|
howard-stearns
|
41dc9a23a8
|
More buttons to get out of away/pause.
|
2016-05-12 15:41:15 -07:00 |
|
David Rowe
|
991f7fe873
|
Fix up syntax per JSLint
|
2016-05-13 10:20:50 +12:00 |
|
Brad Davis
|
85272a87ba
|
Merge pull request #7859 from samcake/lemon
Introduce the "Unlit" shading model support and apply it to Web Enitities
|
2016-05-12 15:09:50 -07:00 |
|
samcake
|
670826effc
|
appeasing linux gods ?
|
2016-05-12 14:50:41 -07:00 |
|
samcake
|
c6aeaf308b
|
appeasing linux gods ?
|
2016-05-12 14:36:45 -07:00 |
|
samcake
|
a436c54817
|
make scribe spit out bigger chunks of litteral strings
|
2016-05-12 14:14:05 -07:00 |
|
James B. Pollack
|
e92b4029b2
|
Merge pull request #7866 from imgntn/firePit
[Home] Updates to content
|
2016-05-12 13:48:40 -07:00 |
|
Seth Alves
|
009c288745
|
revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out
|
2016-05-12 13:29:40 -07:00 |
|
Zach Pomerantz
|
edf82c57ba
|
Clean scripting thread deletion
|
2016-05-12 12:45:02 -07:00 |
|
Zach Pomerantz
|
13d602487f
|
Remove guard over atomic in ScriptEngine::stop
|
2016-05-12 12:43:16 -07:00 |
|
Zach Pomerantz
|
820fdf09e2
|
Remove unused ScriptEngine::_wantSignals
|
2016-05-12 12:42:29 -07:00 |
|
Seth Alves
|
2f93a38a6a
|
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3
|
2016-05-12 11:17:18 -07:00 |
|
Seth Alves
|
63073301ee
|
try again to fix update logic
|
2016-05-12 11:16:42 -07:00 |
|
David Rowe
|
8f214a6b14
|
Merge branch 'master' into 99997
|
2016-05-12 17:50:34 +12:00 |
|
David Rowe
|
7be33a8584
|
Don't show header or dates and sizes when choosing a directory
|
2016-05-12 17:25:44 +12:00 |
|
David Rowe
|
d798e562fc
|
Update scrollbar in tree view to match table scrollbar
Used in Running Scripts and Asset Browser dialogs.
|
2016-05-12 17:18:30 +12:00 |
|
David Rowe
|
b6fcb77d6f
|
Update Running Scripts list to use updated QML table control
|
2016-05-12 17:16:56 +12:00 |
|
David Rowe
|
c29b82e24d
|
Restyle file selection dialog
First pass
|
2016-05-12 17:08:28 +12:00 |
|
Seth Alves
|
c9c619916c
|
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
|
2016-05-11 19:37:57 -07:00 |
|
Seth Alves
|
2101d7dea3
|
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3
|
2016-05-11 18:50:01 -07:00 |
|
Seth Alves
|
ce3faa2916
|
fix logic in UpdateEntityOperator
|
2016-05-11 18:47:20 -07:00 |
|
Seth Alves
|
c784ca9771
|
debugging
|
2016-05-11 18:45:56 -07:00 |
|
Seth Alves
|
fcd2e45d67
|
merge from upstream
|
2016-05-11 18:45:32 -07:00 |
|
Zach Pomerantz
|
25deaf5bda
|
Repost missed Presents with low priority
|
2016-05-11 18:27:48 -07:00 |
|
samcake
|
d5a9d39edf
|
Defaulting the color formats used in the rendering pipeline to sRGB
|
2016-05-11 18:01:19 -07:00 |
|
Anthony Thibault
|
8fecb51dde
|
Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw
Eye tracking bug fix and debug rendering improvements
|
2016-05-11 17:41:49 -07:00 |
|
Seth Alves
|
032fbd9a55
|
taking something off now makes it an entity-server-aware entity
|
2016-05-11 16:41:00 -07:00 |
|
Zach Pomerantz
|
8db1f296de
|
Check vector access in fbx reader
|
2016-05-11 15:17:59 -07:00 |
|
Brad Hefta-Gaub
|
d656f61c64
|
Merge pull request #7759 from jherico/app_plugin_type
Don't expose raw pointer to the display plugin
|
2016-05-11 14:49:22 -07:00 |
|
Brad Davis
|
ba357721bf
|
Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements
Fix for vive controllers sometimes not working
|
2016-05-11 14:32:33 -07:00 |
|
David Rowe
|
57fae3fc51
|
Add FiraSans-Regular font
|
2016-05-12 09:28:25 +12:00 |
|
Seth Alves
|
73c06b3bf4
|
updating attachedEntitiesManager to work with new system
|
2016-05-11 14:13:08 -07:00 |
|
Anthony J. Thibault
|
95ef543f25
|
viveTouchpadTest.js: don't throw if there is no Vive controller attached.
|
2016-05-11 13:35:17 -07:00 |
|