Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-02 07:40:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43379 commits 73 branches 59 tags 1.2 GiB
Commit graph

43379 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
9bd4b4f8d8 Merge branch 'master' of github.com:highfidelity/hifi into fix-update-entity-operator 2016-05-13 07:12:11 -07:00
Seth Alves
79141e3869 dry up some code 2016-05-13 07:06:25 -07:00
samcake
fa87c68ca7 INtroducing the TransformBuffer 2016-05-13 01:08:25 -07:00
David Rowe
1928f51b3e Restore window position at script start 2016-05-13 13:56:31 +12:00
David Rowe
ec74cb4aec Maintain offset of bottom with nearest display edge if Interface resized 2016-05-13 13:22:03 +12:00
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
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
63073301ee try again to fix update logic 2016-05-12 11:16:42 -07:00
Seth Alves
ce3faa2916 fix logic in UpdateEntityOperator 2016-05-11 18:47:20 -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
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
Anthony J. Thibault
95ef543f25 viveTouchpadTest.js: don't throw if there is no Vive controller attached. 2016-05-11 13:35:17 -07:00
samcake
80c80091e4 Cleaning up code 2016-05-11 11:12:39 -07:00
Brad Hefta-Gaub
e01681eb52 Merge pull request #7856 from ZappoMan/NUEtweaks 
don't show help or login on first run
 2016-05-11 10:53:09 -07:00
samcake
99dcfef5a8 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-11 10:47:38 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
Anthony J. Thibault
c91455a291 Added mapping from Vive LSTouch and RSTouch to Standard. 2016-05-11 10:36:55 -07:00
James B. Pollack
8cac61081d change cuckoo and whiteboard positions 2016-05-11 10:33:06 -07:00
James B. Pollack
46c6999dd4 add fire sound 2016-05-11 09:59:50 -07:00
Anthony J. Thibault
09a4e0eaa8 Fix for vive controllers sometimes not working 
* Fixed bug with input devices that where added, removed then re-added.
  The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
  by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
  Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
 2016-05-10 19:32:08 -07:00
samcake
e40a795a27 Trying to clean up for pr 2016-05-10 19:25:22 -07:00