Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:55:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
47834 commits 71 branches 56 tags 1.2 GiB
Commit graph

47834 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
ba9d9f6ab7 Merge pull request #8860 from davidkelly/dk/2004 
Fix for sandbox startup issue
 2016-10-21 14:24:08 -07:00
Anthony J. Thibault
c431c69d60 Merge branch 'master' into feature/controller-display 2016-10-21 13:48:07 -07:00
Andrew Meadows
e44672180a add Bullet profile info to PerformanceTimer stats 2016-10-21 13:22:22 -07:00
Brad Davis
1bd398ae5e Report offscreen texture memory usage in stats 2016-10-21 11:31:37 -07:00
Seth Alves
5660063702 code review 2016-10-21 11:05:50 -07:00
Seth Alves
5af8dfdfbd move ScriptEngines to Agent 2016-10-21 10:57:58 -07:00
Seth Alves
30f29d1796 move ScriptEngines to Agent 2016-10-21 10:57:22 -07:00
Seth Alves
e988941d14 undo bad script-engine AC change 2016-10-21 10:53:13 -07:00
Anthony J. Thibault
60f728585a away.js now shows hand controllers in away mode. 
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
  and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
 2016-10-21 10:40:39 -07:00
Chris Collins
8481d0baa5 Merge pull request #8872 from birarda/master 
always go to dev welcome when not using stable services
 2016-10-21 06:16:26 -07:00
Anthony J. Thibault
5d7f79ab00 Added atp-extract.py tool 2016-10-20 18:25:29 -07:00
Anthony J. Thibault
2193c5faad Integrated controller display from tutorial scripts + assets 2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
6279b273fc Merge pull request #8867 from jherico/offscreen_textures 
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
 2016-10-20 17:07:29 -07:00
David Kelly
20b140317c PR feedback 
bool to indicate sandbox is actually running.
 2016-10-20 17:01:09 -07:00
Howard Stearns
ca0d6587b5 Merge pull request #8869 from hyperlogic/bug-fix/edit-picking-with-hand-controllers 
edit.js: Fix for picking and manipulating objects via hand controllers.
 2016-10-20 16:59:56 -07:00
Philip Rosedale
8c5dd1170e Merge pull request #8871 from howard-stearns/fix-system-hand-laser-flicker 
fix flicker in system (inside the hud) hand-lasers.
 2016-10-20 16:53:57 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Chris Collins
414a79d986 Merge pull request #8868 from huffman/fix/away-overlays 
Remove showing of overlays in away.js
 2016-10-20 16:42:05 -07:00
Stephen Birarda
5886996bc3 always go to dev-welcome when not using stable services 2016-10-20 16:29:40 -07:00
Howard Stearns
0eee6f8abd Merge pull request #8844 from huffman/fix/hud-position 
Update default system toolbar position
 2016-10-20 16:07:20 -07:00
howard-stearns
0141110805 fix flicker in system (inside the hud) hand-lasers. 2016-10-20 15:42:19 -07:00
David Rowe
c6558ebebd Reinstate "reload" button for entity scripts in entities editor 2016-10-21 11:14:57 +13:00
Chris Collins
d431081da6 Merge pull request #8866 from sethalves/fix-crash-on-startup-2025 
fix crash on startup
 2016-10-20 13:56:46 -07:00
Brad Davis
c27ee634ea Fix debug compile issues 2016-10-20 13:56:01 -07:00
Seth Alves
96445f4dee Merge pull request #8861 from hyperlogic/feature/crowd-agent-attachment 
Added attachment support to crowd-agent
 2016-10-20 13:44:25 -07:00
Anthony J. Thibault
53864abaf2 edit.js: Fix for picking and manipulating objects via hand controllers. 
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
 2016-10-20 13:37:31 -07:00
Ryan Downe Karpf
f0766c76e1 Merge pull request #8865 from howard-stearns/fix-resize-on-plugin-switch 
fix resize on plugin switch
 2016-10-20 12:40:31 -07:00
Brad Davis
9523660027 Fix offscreen QML texture leak, improve texture sharing for same size surfaces 2016-10-20 11:55:25 -07:00
Ryan Huffman
fad0607bf6 Remove showing of overlays in away.js 2016-10-20 11:49:23 -07:00
Brad Hefta-Gaub
8a071f18b3 more work 2016-10-20 11:18:20 -07:00
Seth Alves
b31acc421a fix crash on startup 2016-10-20 10:36:14 -07:00
David Kelly
ab02fd79a0 since we know the state, use that boolean 2016-10-20 10:12:26 -07:00
Seth Alves
8ac799ddaf Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 
Fix some audio mixer data races
 2016-10-20 10:01:26 -07:00
howard-stearns
6f283a4893 fix resize on plugin switch 2016-10-20 09:39:02 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
 2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
6109f41ae2 Merge pull request #8859 from Atlante45/seq-num-race 
Fix sequence number race condition
 2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
4a6101060c Merge pull request #8862 from zzmp/fix/quick-leak 
fix leak from qml surfaces' render controls
 2016-10-20 08:23:28 -07:00
Brad Hefta-Gaub
bf732127ca Merge pull request #8856 from jherico/geometry_ids 
Remove the use of implicit ids in geometry cache
 2016-10-20 08:14:49 -07:00
Brad Hefta-Gaub
9bfc8502f1 Merge pull request #8863 from zzmp/fix/quick-crash 
fix intermittent crash on teleport from contextless Qt connection
 2016-10-19 22:22:51 -07:00
Brad Hefta-Gaub
9008de72e0 Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments 
Adjustment to position and visibility of grab sphere.
 2016-10-19 21:51:02 -07:00
Brad Hefta-Gaub
e6e988c1a1 Merge pull request #8857 from howard-stearns/fix-crowd-animation-again 
fix crowd animation again
 2016-10-19 17:41:52 -07:00
Brad Hefta-Gaub
00d613a60e Merge pull request #8848 from sethalves/quiet-compiler 
quiet warnings in Linux build
 2016-10-19 17:41:19 -07:00
Brad Hefta-Gaub
9cb0c973de Merge pull request #8849 from zzmp/fix/shapekey-ref 
fix invalid ShapeKey ref
 2016-10-19 17:39:06 -07:00
Anthony J. Thibault
55c062098a Adjustment to position and visibility of grab sphere. 
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
 2016-10-19 17:33:05 -07:00
Zach Pomerantz
02b4c43cff delete _renderControl after use 2016-10-19 17:09:29 -07:00
Zach Pomerantz
df51646307 add ctx to qml surface cxs 2016-10-19 16:56:13 -07:00
Anthony J. Thibault
ca9d497159 Updated viveControllerConfiguration.js with new controller offset 
(cherry picked from commit ec2bc3495082dfb0b472948efa9d6881562ed3f9)
 2016-10-19 15:59:44 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Anthony J. Thibault
c3b05d6477 Added attachment support to crowd-agent 2016-10-19 15:02:55 -07:00