Sam Gateau
|
fe633cd545
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-06 15:04:02 -07:00 |
|
Sam Gateau
|
4d48b98364
|
For a fistfull of magic numbers
|
2015-07-06 14:22:09 -07:00 |
|
Sam Gateau
|
95f5b14d45
|
CLenaing the interface of Item::Status to be more explicit and removing magic numbers
|
2015-07-06 12:47:35 -07:00 |
|
Sam Gateau
|
e63be58251
|
CLenaing the interface of Item::Status to be more explicit
|
2015-07-06 12:23:57 -07:00 |
|
Sam Gateau
|
2bbffff22f
|
Fixing typos
|
2015-07-06 10:22:25 -07:00 |
|
ZappoMan
|
29a7584ee6
|
remove dead code
|
2015-07-03 11:29:59 -07:00 |
|
Sam Gateau
|
e3c06a30a1
|
removing dead code
|
2015-07-02 19:29:09 -07:00 |
|
samcake
|
0c55130548
|
maybe i have solved the passing of the status
|
2015-07-02 17:31:29 -07:00 |
|
Sam Gateau
|
dcd61fd417
|
improvment ?
|
2015-07-02 16:13:54 -07:00 |
|
Sam Gateau
|
79be37f78f
|
improvment ?
|
2015-07-02 16:00:56 -07:00 |
|
Sam Gateau
|
bf052162bb
|
improvment ?
|
2015-07-02 15:53:02 -07:00 |
|
Sam Gateau
|
be8fe25338
|
Trying to finalize the look and behavior of th estatus indicators
|
2015-07-02 15:06:07 -07:00 |
|
Niraj Venkat
|
23979cce8f
|
Merge branch 'yellow' of https://github.com/samcake/hifi into stats
|
2015-07-01 17:31:15 -07:00 |
|
Niraj Venkat
|
ee998d0c74
|
Icon size is a pixel if the inStatus is -1
|
2015-07-01 17:30:50 -07:00 |
|
Sam Gateau
|
e8b11f1198
|
Exposing the display Item Status to js to turn it on/off
|
2015-07-01 17:27:41 -07:00 |
|
Niraj Venkat
|
219bcd19ed
|
Status bar update
|
2015-07-01 16:40:42 -07:00 |
|
Sam Gateau
|
93303a02ec
|
Merge branch 'stats' of https://github.com/venkatn93/hifi into yellow
|
2015-07-01 14:22:40 -07:00 |
|
Sam Gateau
|
dfa6b03a6b
|
Making the first statusGetter noitify
|
2015-07-01 14:20:35 -07:00 |
|
Niraj Venkat
|
32042884c7
|
Merging sam/yellow
|
2015-07-01 14:07:36 -07:00 |
|
Sam Gateau
|
2f04a9d3da
|
refining the shader pipeline and trying to pass a Status Getter from the model and fails
|
2015-07-01 07:47:46 -07:00 |
|
Niraj Venkat
|
a33a76ac27
|
Merge branch 'yellow' of https://github.com/samcake/hifi into stats
|
2015-06-30 16:12:56 -07:00 |
|
Niraj Venkat
|
aa55de46c2
|
Drawing full bounding box
|
2015-06-30 16:09:45 -07:00 |
|
Sam Gateau
|
8bd5e15f73
|
Exposing the viewport to the shader and have a first draft of the draw status pipeline
|
2015-06-30 14:43:57 -07:00 |
|
Niraj Venkat
|
0ea2774d6e
|
Merge branch 'yellow' of https://github.com/samcake/hifi into stats
|
2015-06-30 10:46:07 -07:00 |
|
Sam Gateau
|
20cb519c14
|
first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase
|
2015-06-30 08:19:00 -07:00 |
|
Niraj Venkat
|
d7791982ac
|
Starting stats branch
|
2015-06-29 15:19:50 -07: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
|
31633eca10
|
IMproving the probe system and cleaning the engine script
|
2015-06-19 10:41:40 +02:00 |
|
Sam Gateau
|
fb42613344
|
Fixing transparency that i just broke
|
2015-06-18 20:25:51 +02:00 |
|
samcake
|
89fe1c47be
|
preping for debug the jobs
|
2015-06-18 13:02:06 +02:00 |
|
samcake
|
cc65ad3ffb
|
IMproving the JOb interface
|
2015-06-17 15:52:11 +02:00 |
|
Sam Gateau
|
d1ac3148f0
|
migrating the transparent pipeline
|
2015-06-16 17:33:53 +02:00 |
|
Sam Gateau
|
b1ff877af1
|
trying to improve something ?
|
2015-06-16 15:56:38 +02:00 |
|
Sam Gateau
|
9be87758fd
|
Improving the design of the Jobs and varying
|
2015-06-16 15:00:47 +02:00 |
|
Sam Gateau
|
38694e4f65
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-06-14 18:56:34 +02:00 |
|
Ryan Huffman
|
81d003bdb8
|
Add post-scale to view matrix when in mirror mode
|
2015-06-12 13:05:10 -07:00 |
|
Ryan Huffman
|
ad77374732
|
Fix setting of _renderMode
|
2015-06-12 13:03:33 -07:00 |
|
Sam Gateau
|
09e12f93b3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-06-12 17:17:32 +02:00 |
|
Sam Gateau
|
bacdaf416f
|
Working on the Job input/output mechanism
|
2015-06-12 17:15:41 +02:00 |
|
Brad Hefta-Gaub
|
a1ee339765
|
Merge pull request #5103 from samcake/punk
TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene
|
2015-06-11 10:17:38 -07:00 |
|
Andrew Meadows
|
7d0000c537
|
fix warning about returning ref to temp variable
|
2015-06-11 08:38:03 -07:00 |
|
Sam Gateau
|
7685fe2229
|
Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool
|
2015-06-11 06:40:21 -07:00 |
|
Sam Gateau
|
2785f1a0e2
|
Fixing the blackout when entering a zone with a skybox thatis not loaded yet or just a constant color skybox
|
2015-06-10 01:50:52 -07:00 |
|
Sam Gateau
|
dd84bf010b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-06-10 00:32:22 -07:00 |
|
Sam Gateau
|
7de4c2eff7
|
first take on the materialKey
|
2015-06-09 12:17:10 -07:00 |
|
Seth Alves
|
983ae5b2f0
|
quiet compiler, fix some whitespace
|
2015-06-08 21:19:37 -07:00 |
|
ZappoMan
|
26ef6af009
|
use emplace_back and pre-reserved sizes for vectors
|
2015-06-08 12:45:39 -07:00 |
|
ZappoMan
|
84c37bd301
|
cache bounds with item ids in DrawTask
|
2015-06-08 09:05:16 -07:00 |
|
ZappoMan
|
46a8b831fc
|
cache bounds with item ids in DrawTask
|
2015-06-08 09:01:12 -07:00 |
|
ZappoMan
|
08ea3368d7
|
hacking on DrawTask perf
|
2015-06-05 13:10:51 -07:00 |
|