Seiji Emery
d75f3b1398
Fixed test target dependencies (which were not getting added into the *-tests build targets)
2015-06-20 11:49:26 -07:00
Seiji Emery
0cc940d433
Modified the build files for external targets so that they longer show up project view in IDEs (which clutters up the view, etc).
...
Said files are now buried under hidden/externals; the (phony) build targets still exist and are visible in the target dropdown, but this is filterable (in Xcode, dunno about Visual Studio (just start typing and a filter/search box comes up))
2015-06-19 21:58:16 -07:00
Seiji Emery
64922ecc62
Setup cmake build files for QtTest-based unit tests.
2015-06-19 21:39:34 -07:00
Brad Hefta-Gaub
587bf78826
Merge pull request #5170 from samcake/punk
...
Fix the cookie cutter issue in stereo
2015-06-19 09:19:00 -07:00
Sam Gateau
873955b17e
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-06-19 18:02:56 +02:00
Clément Brisset
5192796851
Merge pull request #5168 from samcake/daft
...
Improving the rendering job architecture
2015-06-19 18:00:39 +02:00
Sam Gateau
2920197e88
Merge branch 'daft' of https://github.com/samcake/hifi into punk
2015-06-19 17:48:07 +02:00
Sam Gateau
598d0a5375
Just remove these changes on SkeletonModel.cpp
2015-06-19 17:44:56 +02:00
samcake
c1e0d24a5c
Merge pull request #5169 from Atlante45/rot
...
Fix rotation handle crash
2015-06-19 17:36:54 +02:00
Sam Gateau
b0f5990bd7
fix syntax
2015-06-19 17:13:29 +02:00
Atlante45
9c7f24eeb6
Add culled option for simple programs
2015-06-19 16:50:38 +02:00
Atlante45
67473ac254
Fix rotation handle crash
2015-06-19 16:40:42 +02:00
Sam Gateau
5a2d2485c0
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
2015-06-19 16:30:48 +02:00
Sam Gateau
9adfdb06fe
undo local modif to SKeletonModel.cpp
2015-06-19 11:00:27 +02:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-19 09:35:40 +02:00
Brad Hefta-Gaub
a7a53d8be7
Merge pull request #5148 from SamGondelman/rotationModes
...
center player in view mode
2015-06-18 18:02:47 -07:00
Brad Hefta-Gaub
750ce250fa
Merge pull request #5150 from SamGondelman/mouseLook
...
mouse look script
2015-06-18 17:41:20 -07:00
Philip Rosedale
2f080a8e29
Merge pull request #5147 from sethalves/more-actions
...
offset action
2015-06-18 17:35:50 -07:00
Seth Alves
c9a7136d51
Merge pull request #5162 from PhilipRosedale/smoother
...
Smoother motion for physical objects as viewed by remote observer
2015-06-18 16:30:34 -07:00
Andrew Meadows
bd25d6b78b
Merge pull request #5140 from sethalves/float-vs-double
...
Fixed compiler warnings related to implicit float/double casts
2015-06-18 15:33:36 -07:00
Sam Gondelman
fb7ddde0ca
removed magic numbers
2015-06-18 15:29:20 -07:00
Seth Alves
021dc64789
merge from upstream
2015-06-18 15:03:09 -07:00
Andrew Meadows
d88d9b2b88
Merge pull request #5141 from sethalves/overloaded-virtual
...
use -Woverloaded-virtual with g++. quiet compiler warnings
2015-06-18 14:58:47 -07:00
Philip Rosedale
61a2196a30
Reduce error tolerances for ballistic prediction that trigger updating the server
2015-06-18 13:21:37 -07:00
Sam Gateau
fb42613344
Fixing transparency that i just broke
2015-06-18 20:25:51 +02:00
Brad Hefta-Gaub
b008b810e1
Merge pull request #5145 from Atlante45/text
...
Bring back display names
2015-06-18 11:25:45 -07:00
Seth Alves
7d707447ca
move multi-line function out of header
2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625
Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual
2015-06-18 11:04:24 -07:00
Brad Davis
cd325f7bf4
Merge pull request #5157 from ZappoMan/fixOpenGLDependency
...
first cut and removing openGl dependency in shared
2015-06-18 10:21:38 -07:00
Seth Alves
53b5c8e6e7
more merge fallout
2015-06-18 10:19:12 -07:00
Sam Gondelman
3baf6d80ae
removed magic numbers from mouseLook.js
2015-06-18 10:10:54 -07:00
Seth Alves
f9618ca2cb
implicit cast
2015-06-18 10:07:12 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
ZappoMan
383a2c3d63
another attempt
2015-06-18 09:43:39 -07:00
ZappoMan
673e1ee0cc
first cut and removing openGl dependency in shared
2015-06-18 09:30:34 -07:00
Atlante45
26e8c490c3
constexpr not handled on windows
2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7
Make array size a constexpr
2015-06-18 15:23:53 +02:00
Atlante45
d0f27f1648
Change display names size
2015-06-18 15:23:53 +02:00
Atlante45
c38fa46eb1
Increase anti z-fighting value
2015-06-18 15:23:53 +02:00
Atlante45
045a6a6ad9
Use render args frustum
2015-06-18 15:23:52 +02:00
Atlante45
30fbd37645
Transmit normal to text rendering shader
2015-06-18 15:23:52 +02:00
Atlante45
be261cd038
Increase anti z-fighting value
2015-06-18 15:23:52 +02:00
Atlante45
fb6de91cbe
HACK Prevent head hight value explosion
2015-06-18 15:23:51 +02:00
Atlante45
3b41a8f209
Cancel display names roll
...
This is annoying in HMD
2015-06-18 15:23:51 +02:00
Atlante45
e1b5a3c204
Fix display name transform
...
They now have a fixed pixel size and ar pixel aligned
2015-06-18 15:23:51 +02:00
Atlante45
1cab853f18
Better guard Transform scale
2015-06-18 15:23:50 +02:00
Atlante45
8a3a7e5b7f
Reorder triangle strip
2015-06-18 15:23:50 +02:00
Atlante45
a9d2bb1e1c
Coding standard
2015-06-18 15:23:50 +02:00
Atlante45
254f05072f
Fix inverted if
2015-06-18 15:23:49 +02:00