Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 05:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
42744 commits 71 branches 59 tags 1.2 GiB
Commit graph

6053 commits

Author SHA1 Message Date
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub
f4e4f217e8 Merge pull request #7642 from ctrlaltdavid/20872 
Further restyling of edit.js
 2016-04-22 13:46:26 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
David Rowe
545d373a90 Display gap between consecutive selected entities 2016-04-22 13:29:53 +12:00
David Rowe
032b8a94a4 Change registration property's label 2016-04-22 13:22:57 +12:00
David Rowe
7b9e6b52fb Merge branch 'master' into 20872 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-04-22 13:19:47 +12:00
Brad Hefta-Gaub
48fcaf9e4b Merge pull request #7734 from jherico/perf_testing 
Make the rendering testing destination customizable
 2016-04-21 16:10:20 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates 
Add renderRates.js to visualize rates over time
 2016-04-21 15:59:58 -07:00
Brad Davis
b85b8db337 Better visual for texture stress test 2016-04-21 14:46:11 -07:00
Brad Davis
e4233f87ec Increase default renderstats window size 2016-04-21 14:46:10 -07:00
Brad Davis
8f91768bc0 Make the testing destination customizable 2016-04-21 13:47:55 -07:00
Ryan Huffman
712c0bdf9d Update 'model' icon in edit.js 2016-04-20 10:00:38 -07:00
David Rowe
203bcd5886 Hover spin buttons individually 2016-04-20 16:23:13 +12:00
David Rowe
54b032f612 Merge branch 'master' into 20872 2016-04-20 08:51:53 +12:00
samcake
3dad4f576e Merging with master 2016-04-19 11:59:44 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange 
Reset entities script engine on domain change
 2016-04-19 11:14:28 -07:00
samcake
a997f9bb1b Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-19 10:49:53 -07:00
Zach Pomerantz
fc61f85bf9 Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback 
Added MyAvatar onLoadComplete Callback
 2016-04-19 10:36:20 -07:00
samcake
265f6f1275 Updating & Merging with master 2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
5d550197bd Merge pull request #7697 from samcake/orange 
Introduce a simple state sort for drawing opaque items
 2016-04-19 08:41:49 -07:00
Anthony Thibault
4708cc9400 Added license to disableAvatarAnimations.js 2016-04-18 19:42:05 -07:00
Brad Hefta-Gaub
a572ac31dc Merge pull request #7704 from samcake/lemon 
Exposing the CPU TIming of the Render Jobs to the JS API
 2016-04-18 18:12:14 -07:00
Brad Hefta-Gaub
0ac9601ea7 Merge pull request #7690 from ZappoMan/improveHMD 
Introduce "recommended overlay rectangle" to display plugins
 2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
5ae1e70197 Merge pull request #7689 from hyperlogic/tony/jasmine-avatar-unit-tests 
Added avatar unit tests
 2016-04-18 18:03:29 -07:00
David Rowe
47b4c36546 Merge branch 'master' into 20872 2016-04-19 12:56:55 +12:00
David Rowe
99d9378ffd Fix entity list header and footer text sometimes disappearing 2016-04-19 12:51:13 +12:00
Zach Pomerantz
b11d6ca1c6 Make Render Rates qml script 2016-04-18 17:43:34 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Brad Hefta-Gaub
c3a86f46d0 change the timeout to an interval so it constantly runs 2016-04-18 14:55:23 -07:00
samcake
ca720efce6 Exposing the timing of the jobs by default 2016-04-18 14:53:06 -07:00
Brad Hefta-Gaub
ab7f3d5739 change the timeout to an interval so it constantly runs 2016-04-18 13:58:40 -07:00
Brad Hefta-Gaub
d6fa58c39c add an example script 2016-04-18 13:42:58 -07:00
Brad Hefta-Gaub
24003840df add an example script 2016-04-18 13:33:08 -07:00
Brad Hefta-Gaub
6ac173d197 add an example script 2016-04-18 13:27:05 -07:00
samcake
3887dfdf34 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-18 11:52:45 -07:00
Anthony J. Thibault
f15bc7b99a Added script to disable avatar animations, but not IK. 2016-04-18 11:41:28 -07:00
samcake
d746fba142 Cleaning up the stats.qml 2016-04-18 11:18:28 -07:00
Anthony J. Thibault
efb6a5c3f6 hifi-boot.js: Coding convention update 2016-04-18 09:49:09 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807 code review feedback 2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
d5a46d3390 handle repositioning of qml windows 2016-04-15 20:01:14 -07:00
Anthony J. Thibault
9ab3255285 updated avatarUnitTests.js 2016-04-15 18:07:07 -07:00
samcake
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Howard Stearns
e4f8a67e60 Merge pull request #7649 from hyperlogic/tony/simplify-away-mode 
away.js: fix for permanent disabling avatar IK
 2016-04-15 13:35:14 -07:00
Anthony J. Thibault
700f548f44 Added stub jasmine unit tests for MyAvatar 2016-04-15 11:01:10 -07:00
Anthony J. Thibault
d02836a0cb Add jasmine 2.4.1 unit test library 
Along with a customized hifi-boot.js file that configures jasmine
reporting to run within hifi.
 2016-04-15 10:58:45 -07:00
David Rowe
c7f5b356bb Fix entity not being highlighted in list when created 2016-04-15 17:18:04 +12:00
David Rowe
f9a442264e Fix count of entities found when delete all entities in search radius 2016-04-15 16:58:26 +12:00