David Rowe
e20df0e2bf
Delete Leap and RealSense devices on shutdown
...
Leaving them running prevents a clean shutdown on Windows when running
Interface.exe from a command line: the interface.exe process stays alive
preventing Interface from being run again from the command line without
manually terminating the running process.
2015-05-07 18:28:49 -07:00
samcake
bb77ba95d0
Merge pull request #4793 from ZappoMan/moreZoneProperties
...
Wire up the atmosphere and skybox properties into edit.js
2015-05-07 13:48:19 -07:00
ZappoMan
20fe43c852
wire up new zone properties, fix bug in group proprties decode
2015-05-07 13:05:00 -07:00
ZappoMan
d9f17d010c
first cut at adding new zone properties to edit tools
2015-05-07 11:41:23 -07:00
samcake
12c26f9c3c
Merge pull request #4789 from Atlante45/display_zones
...
Display zones
2015-05-07 11:20:46 -07:00
Atlante45
7689837463
Merge branch 'display_zones' of github.com:Atlante45/hifi into display_zones
2015-05-07 20:17:07 +02:00
Atlante45
f761ba521a
Quiet compiler
2015-05-07 20:16:03 +02:00
Atlante45
591548dc38
Missing comma
2015-05-07 20:15:40 +02:00
Atlante45
faabf29e84
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 19:58:26 +02:00
Clément Brisset
8997879b02
Merge https://github.com/highfidelity/hifi into display_zones
2015-05-07 18:39:51 +01:00
Clément Brisset
345875d0c4
Merge pull request #4775 from ZappoMan/skyboxPropertiesInZones
...
added skybox group properties to zones, wired up color to the actual skybox rendering
2015-05-07 19:35:33 +02:00
Atlante45
cafaeed822
Restore polygon mode after entities rendering
...
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
2015-05-07 13:34:22 +02:00
Atlante45
366964e424
Fix static initialisation fiasco
2015-05-07 13:00:56 +02:00
Atlante45
721eeccce2
Restaure GL to default after we render a batch
2015-05-07 12:01:22 +02:00
Atlante45
00571dad00
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 10:13:59 +02:00
Brad Hefta-Gaub
01f96f4e62
Merge pull request #4788 from samcake/orange
...
Try to fix the transform stack issue in 1st person
2015-05-06 23:47:52 -07:00
Sam Gateau
bba7dcfe5f
Try to fix the transform stack issue in 1st person
2015-05-06 23:32:02 -07:00
ZappoMan
496da6fcd5
wire up the skybox color property to the new skybox renderer
2015-05-06 20:36:06 -07:00
ZappoMan
af2c3d91cf
Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones
2015-05-06 18:05:54 -07:00
Stephen Birarda
e3490838de
Merge pull request #4787 from jherico/flipped_icons
...
Fix inverted icons
2015-05-06 20:25:43 -04:00
Bradley Austin Davis
3b8108e887
Fix inverted icons
2015-05-06 16:09:17 -07:00
Philip Rosedale
72da678bc2
Merge pull request #4785 from jherico/scale
...
Fix ensmallened overlay UI
2015-05-06 15:30:01 -07:00
Bradley Austin Davis
561d275dda
Fix ensmallened overlay UI
2015-05-06 15:18:17 -07:00
Philip Rosedale
cd4cc30a34
Merge pull request #4783 from thoys/20522
...
CR for Job #20522 - Make Jenga
2015-05-06 15:14:58 -07:00
ZappoMan
b7dfbd103a
Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones
2015-05-06 14:41:53 -07:00
Brad Hefta-Gaub
5551997cdc
Merge pull request #4780 from samcake/blue
...
Add support for Skybox and rendering path of background according to Zones
2015-05-06 14:41:06 -07:00
Thijs Wenker
477447b95f
Planky game script
2015-05-06 23:36:44 +02:00
Seth Alves
719747ee2d
Merge pull request #4725 from howard-stearns/objReader
...
Textures for .obj reader:
2015-05-06 14:30:29 -07:00
Brad Hefta-Gaub
cb4a76a5cd
Merge pull request #4758 from jherico/plugins_pt1
...
Display Plugins Prep - Part 1
2015-05-06 14:27:09 -07:00
Sam Gateau
8fd77f964c
Fix include filke case for ubuntu...
2015-05-06 14:23:42 -07:00
Bradley Austin Davis
3c10d29d53
Removing another reference to oculus manager
2015-05-06 14:09:43 -07:00
Bradley Austin Davis
351246fac1
Fixing new image texture use from last upstream merge
2015-05-06 12:50:20 -07:00
Sam Gateau
00c45dbb43
missing includes
2015-05-06 12:38:12 -07:00
Howard Stearns
35337ef2c2
Spell out order-of-evaluation for the compiler.
2015-05-06 12:28:45 -07:00
Sam Gateau
0fbccf1d33
get ready for PR, SKY_DOME by default
2015-05-06 12:22:19 -07:00
Sam Gateau
1b5185abeb
fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome
2015-05-06 12:19:19 -07:00
Bradley Austin Davis
ea6f840fdb
Merge remote-tracking branch 'upstream/master' into plugins_pt1
2015-05-06 12:18:04 -07:00
samcake
06e1330e42
Clean up the includes in gpu, make the skybox shader works
2015-05-06 12:12:54 -07:00
Brad Hefta-Gaub
4de6d645e5
Merge pull request #4701 from jherico/infoview
...
Infoviews & Browser in QML
2015-05-06 12:12:21 -07:00
Brad Davis
a9de502e76
removing commented out old implementation.
2015-05-06 12:03:47 -07:00
Brad Hefta-Gaub
e1db23887a
Merge pull request #4781 from jherico/off_axis
...
Removing off-axis projection from menu
2015-05-06 11:59:59 -07:00
Howard Stearns
d2dbb2c116
Missing the code!
2015-05-06 11:57:34 -07:00
Bradley Austin Davis
fc73676b4d
Merge branch 'master' into plugins_pt1
2015-05-06 11:43:25 -07:00
ZappoMan
f2ebb6e821
fix output of group names to be lowercase
2015-05-06 11:30:41 -07:00
Bradley Austin Davis
4c22e637d7
Merge remote-tracking branch 'upstream/master' into off_axis
2015-05-06 11:28:03 -07:00
Bradley Austin Davis
c832fd969a
Removing off-axis projection from menu
2015-05-06 11:26:46 -07:00
Clément Brisset
9f8e52652b
Merge pull request #4771 from ctrlaltdavid/20526
...
CR for #20526 - Fix Mixamo avatar clipping in HMD view
2015-05-06 20:17:07 +02:00
samcake
50012ee9de
fixing build issues on MAc
2015-05-06 11:00:37 -07:00
ZappoMan
edb84a1a14
Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones
2015-05-06 10:52:04 -07:00
Brad Hefta-Gaub
b27154186b
Merge pull request #4779 from jherico/hmd_tools
...
Fix for HMDTools targeting wrong screen on OSX
2015-05-06 10:46:55 -07:00
