Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 08:20:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41995 commits 25 branches 0 tags 1.1 GiB
Commit graph

41995 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
92df0e45e6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-04-06 16:34:23 -07:00
samcake
16174df0f3 POlishing the size evaluation and trying to debug the compression scheme 2016-04-06 16:33:45 -07:00
Zach Pomerantz
06e827cb5e Guard against no script engine thread affinity 2016-04-06 15:41:13 -07:00
howard-stearns
f35c59ce5f Guard against meaningless query and fragment parts. 2016-04-06 15:21:43 -07:00
Brad Hefta-Gaub
47aed9c8bd fix redraw issue when logging in to or out of a domain 2016-04-06 14:56:20 -07:00
Zach Pomerantz
4300f2e415 Delete resource the Qt way 2016-04-06 14:43:48 -07:00
Seth Alves
672b4df7c1 get rid of magic number 2016-04-06 13:36:44 -07:00
Brad Hefta-Gaub
1f708ccb57 default to first person view 2016-04-06 13:35:08 -07:00
David Rowe
9119b82718 Fix right margin of entities list 2016-04-07 08:19:16 +12:00
David Rowe
b6a511ac80 Fix spin box buttons not appearing on OSX 2016-04-07 08:15:25 +12:00
David Rowe
dfa7416acb Fix horizontal scrollbar appearing in entity properties tab on OSX 2016-04-07 08:10:24 +12:00
David Rowe
079e4080c1 Fix entities editor fonts on OSX 2016-04-07 08:04:52 +12:00
Atlante45
6d1b7f1d37 Wrap sound script object to hold a strong ref 2016-04-06 13:04:18 -07:00
Seth Alves
21c2db7cdc attempt to make the failed-to-load-entity-script error-message be more helpful 2016-04-06 12:40:59 -07:00
howard-stearns
f60bb1faa5 Merge branch 'master' of https://github.com/highfidelity/hifi into restore-text3d-overlay 2016-04-06 12:16:19 -07:00
howard-stearns
5284af6b51 Update text3d shader post pbr. 2016-04-06 12:15:19 -07:00
ericrius1
0e08b15db7 spacing fix attempt 2016-04-06 11:30:29 -07:00
Brad Davis
e194fc39f4 Move the texture transfer context back to the main thread for shutdown 2016-04-06 11:29:03 -07:00
Brad Hefta-Gaub
2ee5b45ca6 Merge pull request #7583 from zzmp/log/bookmarks-exists 
Do not warn if no bookmarks file
 2016-04-06 11:20:06 -07:00
Zach Pomerantz
1e710712cc Check entities scripting thread before signaling it 2016-04-06 11:19:07 -07:00
Seth Alves
d09d16082e Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children 2016-04-06 11:05:31 -07:00
Brad Hefta-Gaub
0f4e1e79fd Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-04-06 11:01:00 -07:00
Brad Hefta-Gaub
8c15116190 fix auto-hide logic in depthReticle 2016-04-06 11:00:43 -07:00
ericrius1
2be2f940ea remove panel 2016-04-06 10:59:18 -07:00
ericrius1
21f6d7bee3 fixed largeroom illegal characters 2016-04-06 10:50:58 -07:00
ericrius1
ce290a1993 got rid of illegal character 2016-04-06 10:38:59 -07:00
ericrius1
9cac249122 f1 2016-04-06 10:36:38 -07:00
Ryan Huffman
5fb898de74 Add rolled log files to BugSplat 2016-04-06 10:14:12 -07:00
samcake
e28e85a29c Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-04-06 09:30:53 -07:00
Brad Hefta-Gaub
e76a04951c Merge pull request #7582 from zzmp/fix/desktop-signal 
Fix showDesktop SIGNAL
 2016-04-06 08:29:26 -07:00
Brad Hefta-Gaub
51660ab3a8 Merge pull request #7579 from sethalves/log-about-webengine-remote-debugging 
Log about webengine remote debugging
 2016-04-06 08:28:37 -07:00
samcake
d9bc06d92d Trying to ge5t the proper behavior for the Compression texture and textures in genral... 2016-04-05 19:13:24 -07:00
Brad Hefta-Gaub
699c717828 Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix 
Application: focusOut keyboard device when clicking on web entity.
 2016-04-05 18:44:30 -07:00
Brad Hefta-Gaub
70f3a39463 Merge pull request #7593 from hyperlogic/tony/keyboard-focus-improvements 
Application: change keyboard input focus when using ui overlay.
 2016-04-05 18:44:16 -07:00
Anthony J. Thibault
07ff687bfe Application: change keyboard input focus when using ui overlay. 
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
 2016-04-05 18:12:02 -07:00
Brad Hefta-Gaub
5cf2906cd4 Merge pull request #7576 from hyperlogic/tony/show-collision-geometry-fixes 
Model: Toggling Physics > Draw Collision Hulls works again
 2016-04-05 17:50:19 -07:00
Brad Hefta-Gaub
52497b1dfc Merge pull request #7560 from sethalves/remove-handcontroller-touch 
remove code that sends entity 'touch' events
 2016-04-05 17:50:07 -07:00
Stephen Birarda
fdde3f2551 Merge pull request #7587 from huffman/fix/assignment-duplicate 
Fix AssignmentClient unpacking an assignment when it already has one
 2016-04-05 17:28:44 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
Ryan Huffman
29c287227c Fix AssignmentClient unpacking an assignment when it already has one 2016-04-05 15:30:53 -07:00
Zach Pomerantz
37efeb7f29 Avoid warning for expected unset PresentThread 2016-04-05 14:59:59 -07:00
Zach Pomerantz
cba866b375 Do not warn if no bookmarks file 2016-04-05 14:59:57 -07:00
Zach Pomerantz
91126037e0 Fix showDesktop SIGNAL 2016-04-05 14:59:54 -07:00
Zach Pomerantz
6bcfeccdd8 Log failed MenuUserData::forObject 2016-04-05 14:59:52 -07:00
Zach Pomerantz
062760ff3b Log failed routes 2016-04-05 14:59:48 -07:00
howard-stearns
1de3aaffc7 Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes 2016-04-05 14:58:27 -07:00
Stephen Birarda
d536026ff4 suppress a couple more noisy messages in AudioRingBuffer 2016-04-05 14:44:20 -07:00
Seth Alves
bda8761e00 fix how env variable is accessed 2016-04-05 14:30:41 -07:00
Stephen Birarda
a0edbac486 change comment for domain-server migration to SHA256 2016-04-05 14:12:50 -07:00
Seth Alves
f42e968dda commit to repush to see if github is working yet 2016-04-05 14:12:46 -07:00