Andrew Meadows
99a75c5a87
Merge 'master' into 'workload'
2018-05-02 17:28:36 -07:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw
...
Added items to the developer menu for debugging physics
2018-05-02 14:25:09 -07:00
Gabriel Calero
4dce62cc2e
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript
...
Avatar Scripts
2018-05-02 12:23:13 -07:00
Anthony J. Thibault
4fa9af5534
Added items to the developer menu for debugging physics
...
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:
* Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
* Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
* Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
* Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
* Show Bullet Constraint Limits - will render the joint limits for each constraint.
2018-05-02 10:51:00 -07:00
Gabriel Calero
c15ef56d90
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 14:38:10 -03:00
samcake
b3408ae4c0
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-05-01 11:39:54 -07:00
luiscuenca
2de982a5a2
Added script types and better script reload
2018-04-30 12:04:35 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
luiscuenca
e0770f06b1
Add scripts to Model Packager
2018-04-25 19:35:26 -07:00
samcake
33bbbcef83
Merging with master
2018-04-24 11:49:34 -07:00
Brad Davis
861200db27
Attempt to shutdown web surfaces more consistently
2018-04-23 14:32:38 -07:00
Seth Alves
6fc02638d7
control verbose logging with a menu-item in developer menu
2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7
remove some uncatagorized logging, suppress some categories by default
2018-04-20 16:08:57 -07:00
Gabriel Calero
adfbaac18f
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-19 19:40:00 -03:00
Gabriel Calero
f2184bf456
Handle android back button. Remove unused resources. Fix compilation errors.
2018-04-19 17:31:25 -03:00
samcake
a6bd589f4f
Merging upstream
2018-04-19 12:20:10 -07:00
Gabriel Calero
c8fe45eb8f
Remove debug statements and unused code. Put JNI code in a separated file.
2018-04-19 11:41:59 -03:00
Brad Davis
d478204722
Working on splash rendering
2018-04-17 14:17:41 -07:00
Gabriel Calero
e85f5c97dc
Remove bottom bar. Apply new design for android
2018-04-09 11:41:00 -03:00
Gabriel Calero
99d8f822b2
Fix crash selecting domain for second time. Stop rendering while Goto activity is started
2018-04-04 19:24:26 -03:00
Gabriel Calero
2ff13270ed
Go back to GoTo screen
2018-04-02 12:22:21 -03:00
samcake
028959f240
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-29 12:00:10 -07:00
samcake
025730a329
Just merging with master and trying to see the ui working again...
2018-03-26 18:24:01 -07:00
Dante Ruiz
1d17658c80
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-22 16:29:16 -07:00
Seth Alves
ef52ae13ee
rearrange domain-url-changed signals
2018-03-21 14:30:00 -07:00
Seth Alves
4033af9b11
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 11:11:43 -07:00
Dante Ruiz
cce77e3e68
made requested changes
2018-03-21 10:15:42 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776
...
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
2018-03-21 09:27:51 -07:00
samcake
a678a38211
Merge with master
2018-03-20 17:35:57 -07:00
Seth Alves
585a523823
unmangle merge
2018-03-20 11:17:56 -07:00
Seth Alves
bd10cd6fa9
'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name)
2018-03-20 10:53:17 -07:00
Ryan Huffman
bee8899c46
Add support for uploading .content.zip files
2018-03-15 12:17:21 -07:00
David Rowe
966d711e56
Fix Window.raiseMainWindow()
2018-03-14 13:38:48 +13:00
samcake
f8acca76e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 09:31:50 -07:00
Seth Alves
b39c7eadd2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-13 09:24:18 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa
...
Temporal Anti-Aliasing
2018-03-13 09:03:50 -07:00
David Rowe
16aefea2e1
Merge branch 'master' into 21776
2018-03-13 14:46:07 +13:00
SamGondelman
9953e7051f
Merge remote-tracking branch 'upstream/master' into android
2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f
cleanup, don't compress rcc file to fix corruption
2018-03-12 13:05:03 -07:00
samcake
9bec8cdd0b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-12 12:01:00 -07:00
Olivier Prat
aad571f6bd
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-03-12 14:22:57 -04:00
Seth Alves
621e6a62d6
merge from upstream
2018-03-09 12:07:24 -08:00
Seth Alves
58bc42990c
merge from upstream
2018-03-09 12:03:26 -08:00
Olivier Prat
da6bd92ff6
Merged with master
2018-03-09 10:07:25 +01:00
Atlante45
69fb830480
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
2018-03-08 17:23:17 -08:00
samcake
a0db5c6135
Merge with master
2018-03-08 15:35:58 -08:00
David Rowe
b1bda281ee
Merge branch 'master' into 21776
2018-03-08 15:36:10 +13:00
Elisa Lupin-Jimenez
c6e5f4c9c8
zip file drags don't auto add model textures
2018-03-06 19:24:09 -08:00
Elisa Lupin-Jimenez
251e4a3127
Fixed blocks importer textures being interpreted as image entities
2018-03-06 16:44:23 -08:00
