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

6904 commits

Author SHA1 Message Date
Seth Alves
58bc42990c merge from upstream 2018-03-09 12:03:26 -08:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes 
tablet scale and position changes
 2018-03-08 15:36:06 -08:00
Seth Alves
7c7f42af06 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-07 18:26:15 -08:00
Seth Alves
4ed0c24a73 use static QStrings rather than functions 2018-03-07 18:25:55 -08:00
Seth Alves
e70ca252de Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-07 16:03:48 -08:00
Seth Alves
12eb0e4109 name emit from AddressManager like an event 2018-03-07 15:36:35 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08:00
Seth Alves
926be73c0a make this work again 2018-03-06 15:50:03 -08:00
Seth Alves
79aa450332 some code-review induced changes 2018-03-06 13:11:09 -08:00
Brad Davis
6cc36136bd Fix assert on interaction with stats and avatarinputs during UI setup 2018-03-06 12:34:21 -08:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
Seth Alves
a6c3bcd8d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-05 08:51:12 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink 
Fix hyperlink when far/near grabbing enitities
 2018-03-05 08:23:51 -08:00
Seth Alves
606face7c0 gather together the url scheme constants, name them consistently 2018-03-02 20:39:38 -08:00
Seth Alves
7a61119d11 remove unneeded call to clearDomainOctreeDetails 2018-03-02 19:27:45 -08:00
Seth Alves
746769cbe9 don't crash 2018-03-02 13:52:18 -08:00
Seth Alves
507dfa5ec3 more code review response 2018-03-02 11:35:34 -08:00
Seth Alves
bdd926f89e cleanups 2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2 merge from upstream 2018-03-02 09:57:27 -08:00
Seth Alves
82bfd25d8b fix placename in title-bar, fix domain-spawning-point 2018-03-02 09:54:54 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
Seth Alves
9ee65ab474 don't use clipboard when loading serverless domains 2018-03-01 13:31:43 -08:00
Seth Alves
2d374583b4 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-01 11:07:50 -08:00
Seth Alves
33065fb51c more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port 2018-03-01 11:07:37 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00
Seth Alves
a44ddbbc26 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-27 14:09:05 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00
Seth Alves
636c271dc3 merge from upstream 2018-02-27 09:21:08 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash 
Fix crash when passing --checkMinSpec flag
 2018-02-26 17:35:46 -08:00
Stephen Birarda
aa7bd2066a Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-26 17:02:00 -08:00
Seth Alves
642e7b7c37
Merge pull request #24 from druiz17/serverless-domains 
Some bug fixes
 2018-02-26 15:25:59 -08:00
Elisa Lupin-Jimenez
b56c78d36c image has correct orientation and is collisionless 2018-02-26 14:44:46 -08:00
Dante Ruiz
a23c425f5e actions and serverless status fixes 2018-02-26 14:24:51 -08:00
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
Seth Alves
f08864f17b Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-26 09:01:41 -08:00
humbletim
f824edd04e * remove Model_temporary_hack 
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
 2018-02-26 04:58:22 -05:00
Seth Alves
9e156deaab
Merge pull request #12494 from druiz17/one-menu 
Remove the avatarEntitiesBookmark menu option
 2018-02-23 19:02:25 -08:00
Brad Hefta-Gaub
3d54f4d246
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog 
Relax deadlock watchdog
 2018-02-23 17:09:30 -08:00
Seth Alves
5632f9d8fd clean up debug prints. put filename in window title-bar when connected to a serverless domain 2018-02-23 16:46:42 -08:00
Atlante45
800d15b405 Make sure settings timer is running 2018-02-23 16:23:50 -08:00
Seth Alves
77febe0aab save avatar-entities which are created while using a serverless domain 2018-02-23 16:03:08 -08:00
Dante Ruiz
07b0431215 fix merge conflict 2018-02-23 14:00:36 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Dante Ruiz
d0ec84b6c8 remove menu option for booking marking avatar entities 2018-02-23 10:45:59 -08:00
Seth Alves
99893d81e2 merge from upstream 2018-02-23 09:14:48 -08:00
Atlante45
c106fee659 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration 2018-02-22 19:45:43 -08:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes 
Android ui fixes
 2018-02-22 18:28:18 -08:00