Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 17:00:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27887 commits 72 branches 59 tags 1.2 GiB
Commit graph

3663 commits

Author SHA1 Message Date
ericrius1
e75a6feafe can toggle hit effect on and off from a script 2015-07-20 11:58:26 -07:00
Philip Rosedale
61c2b172d4 Merge pull request #5357 from ctrlaltdavid/scriptable-muting 
Mute / un-mute face tracking when menu item is changed from script
 2015-07-18 15:45:01 -07:00
David Rowe
47fdbedfb2 Fix FPS throttle default 2015-07-18 15:22:47 -07:00
David Rowe
d0489bf2a0 Add menu item, Developer > Render > Throttle FPS If Not Focus 2015-07-18 14:18:06 -07:00
ZappoMan
26e8090ec1 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub
3ea348b73b Merge pull request #5349 from jherico/marge 
Working on text rendering overlays
 2015-07-17 16:47:48 -07:00
ZappoMan
8692f51399 dead code cleanup 2015-07-17 16:15:02 -07:00
ZappoMan
c20c6e4b90 fix retina in an Austin approved manner 2015-07-17 16:01:32 -07:00
ZappoMan
03a44a1c80 fix retina 2015-07-17 15:45:42 -07:00
Brad Hefta-Gaub
2df75f8bff Merge pull request #5337 from bwent/audioStatsDialog 
Added a dialog box to display Audio Network Statistics
 2015-07-17 14:45:51 -07:00
David Rowe
550e9224c5 Mute / un-mute face tracking when menu item is changed from script 2015-07-17 11:45:15 -07:00
ZappoMan
efa2001325 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 09:25:37 -07:00
ZappoMan
398075e45a hacking on more naked GL 2015-07-16 16:26:28 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
Howard Stearns
01a3701b52 Merge pull request #5329 from SamGondelman/hydraFix 
Hydra hand and mouse fixes
 2015-07-15 19:03:04 -05:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect 
Remove the glow effect.
 2015-07-15 14:50:15 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
bwent
70e3e7caa4 Merge branch 'master' into audioStatsDialog 2015-07-15 12:29:33 -07:00
bwent
2c24251b52 Clean up from previous commit 2015-07-15 11:41:26 -07:00
Sam Gateau
48f23a6eaf Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-15 11:29:41 -07:00
bwent
5b0b7229ba Added a dialog box to display audio network statistics 2015-07-15 11:10:39 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
ZappoMan
e39ea72daf removed dead code 2015-07-14 21:25:49 -07:00
Sam Gondelman
6a0df442f9 emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc) 2015-07-14 17:59:59 -07:00
ZappoMan
f1b85aefa9 more dead code removal: NodeBounds 2015-07-14 17:59:20 -07:00
Philip Rosedale
17ec524253 Merge pull request #5324 from ZappoMan/fixLaggingTouch 
fix lagging touch events
 2015-07-14 16:28:00 -07:00
ZappoMan
68f4fe6566 fix lagging touch events 2015-07-14 16:03:44 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Howard Stearns
51be245159 Remove old octreeFade code that wasn't working anyway. 2015-07-10 16:55:45 -07:00
Atlante45
ec7e1df8c0 Move and rename menu item 2015-07-10 15:47:46 -07:00
Atlante45
4702b39130 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-10 10:56:11 -07:00
Brad Hefta-Gaub
33016e2797 Merge pull request #5293 from jherico/bart 
More profiling ranges and updated performance testing scripts
 2015-07-09 19:10:45 -07:00
Brad Hefta-Gaub
74ef91550c Merge pull request #5296 from venkatn93/master 
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
 2015-07-09 18:54:06 -07:00
Niraj Venkat
007d662db1 Re-added for shouldRenderEntities 2015-07-09 17:40:14 -07:00
Niraj Venkat
706f85e4ce Fixes to comply with coding standard 2015-07-09 17:31:38 -07:00
Seth Alves
d0d0b2a143 Merge pull request #5295 from birarda/master 
potential fix for windows domain connect cycling
 2015-07-09 17:04:06 -07:00
Atlante45
bfeb095fb4 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-09 16:30:56 -07:00
Niraj Venkat
adf5b95835 Changing formatting 2015-07-09 16:25:29 -07:00
Niraj Venkat
52095fd38d Fixing merge 2015-07-09 16:23:40 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
Brad Davis
214405a0e5 Fixing typo 2015-07-09 16:06:27 -07:00
Stephen Birarda
efb89c281f fix creation of QTimer parented by NodeList 2015-07-09 16:02:29 -07:00
Stephen Birarda
a4f1145f06 fix QTimer connection to nodeList 2015-07-09 16:01:41 -07:00
Stephen Birarda
408ecb9735 move domain server check in timer to node thread 2015-07-09 15:59:32 -07:00
Brad Davis
446f800aee More profiling ranges and updated performance testing scripts 2015-07-09 15:43:30 -07:00
Brad Hefta-Gaub
fb07956689 Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix 
fix for mirror rendering on windows
 2015-07-09 08:38:55 -07:00
Anthony J. Thibault
1be0e7ebc3 fix for mirror rendering on windows 
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
  I think this was working on Mac due to the different code paths in
  GLBackendTransform::updateTransform for core vs legacy gl profile.
 2015-07-08 21:33:27 -07:00
Brad Davis
b173ac397c Merge pull request #5278 from samcake/yellow 
Adding more NSight instrumentation
 2015-07-08 20:28:18 -07:00
Atlante45
ee3a8b1b6e Clear resource caches instead of restarting 2015-07-08 18:23:16 -07:00