Leonardo Murillo
83b7054138
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-08 11:55:47 -06:00
Sam Gateau
de61f4ea0b
Gettting th ehighlight on transparent to work
2015-06-08 02:52:13 -07:00
Leonardo Murillo
68b419deec
Syncing
2015-06-05 17:11:32 -06:00
Leonardo Murillo
2236ccf0e1
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-05 16:18:03 -06:00
Niraj Venkat
827d8bd854
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-05 13:33:41 -07:00
Niraj Venkat
a3f19e9d4c
Fixing title bar update on teleport
2015-06-05 13:33:14 -07:00
ZappoMan
7ebe64b52f
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 11:01:17 -07:00
Seth Alves
4e10c28b41
merge from upstream
2015-06-05 10:31:13 -07:00
Brad Davis
16f55c7557
Fix the skybox jiggle in the HMD
2015-06-05 09:52:56 -07:00
ZappoMan
807cc3db24
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 09:37:39 -07:00
Leonardo Murillo
01236e0159
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-05 09:48:44 -06:00
Sam Gateau
3a93409080
Merging the day after the flight back to france, getting all the fixes
2015-06-04 23:02:05 -07:00
Seth Alves
9a67f35b59
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-04 19:02:46 -07:00
Eric Levin
5e15c14539
added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"
2015-06-04 16:45:32 -07:00
Atlante45
94ba84a84c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
2015-06-04 18:48:15 +02:00
ZappoMan
d2deef97cc
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-04 09:24:37 -07:00
Atlante45
41be3fee87
Merge branch 'fix_world_box' of github.com:Atlante45/hifi into lod
2015-06-04 14:39:32 +02:00
Atlante45
96be60c0cf
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
2015-06-04 14:22:12 +02:00
Atlante45
54b0a03fae
Fix wrong enum used
2015-06-04 13:56:21 +02:00
Atlante45
6dc3bf9285
Fix world box messing up everything
2015-06-04 13:48:39 +02:00
Sam Gateau
329a3b4c7d
force the worldbox to use the simple program which should fix its rendering
2015-06-03 23:29:32 -07:00
Seth Alves
4414b67837
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-03 20:43:22 -07:00
Leonardo Murillo
4f93328759
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-03 19:39:00 -06:00
Leonardo Murillo
b60597aa90
AutoUpdate is now a singleton invoked via Dependency Manager, first steps towards QML update notification
2015-06-03 19:38:54 -06:00
Niraj Venkat
29a15453ac
Visual studio tab issues fixed
2015-06-03 15:35:04 -07:00
Niraj Venkat
4db110a6e1
Final fixes. Snapshot should be good now
2015-06-03 15:09:45 -07:00
Niraj Venkat
694272ffaa
"fixed" formatting issues and code cleanup
2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7
Fixed snapshot bug. Snapshots now save and load ok
2015-06-03 14:29:39 -07:00
Ryan Huffman
d6878c20b5
Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch
2015-06-03 12:03:44 -07:00
Sam Gateau
b339aa683a
adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items
2015-06-03 11:25:45 -07:00
Ryan Huffman
b8f3c42712
Update renderWorldBox to use batches
2015-06-03 09:03:04 -07:00
Atlante45
bbf1837796
Introduced RenderDetails/Stats don't pull details
...
- Regrouped everything stat in a struct
- Details are set into the stats
2015-06-03 16:14:23 +02:00
Seth Alves
a31a5a1554
main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step
2015-06-02 19:40:20 -07:00
Leonardo Murillo
cefdbc3126
Checkpoint auto updater
2015-06-02 19:32:03 -06:00
Sam Gateau
640071dd35
Avoiding any setVIewTransform in payloadREnder and introducing monitoring values
2015-06-02 18:23:53 -07:00
Sam Gateau
903837ab4f
exposing some controls on the engine to js for debugging
2015-06-02 15:57:37 -07:00
Sam Gateau
3c7eb4de6d
merging with upstream
2015-06-02 14:48:53 -07:00
Sam Gateau
901717fb2c
trying to fix the issues of model disappearing
2015-06-02 11:52:22 -07:00
Sam Gateau
ef2d8a0dbe
tuesday morning rendering poor performances networking issue
2015-06-02 10:58:56 -07:00
Atlante45
c012a581a6
Set shouldRender method
2015-06-02 19:26:39 +02:00
Sam Gateau
cd7914ad9d
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-06-01 17:31:39 -07:00
Sam Gateau
bd7c22e715
Trying to transfer the rnedering from displaySide to RenderDeferredTask
2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-01 14:42:35 -07:00
Stephen Birarda
12bcbbf338
Merge pull request #5012 from ctrlaltdavid/20555
...
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
2015-06-01 17:08:00 -04:00
samcake
50f3d2d12b
Merge pull request #5014 from ZappoMan/team-teaching-scene-api
...
TEAM TEACHING - report correct part bounds
2015-06-01 13:55:55 -07:00
ZappoMan
750d9c0616
poor mans version of mesh part bounds
2015-06-01 12:53:09 -07:00
samcake
98c0cd7d23
Merge pull request #5009 from ZappoMan/team-teaching-scene-api
...
TEAM TEACHING - hacking on rendering mesh parts
2015-06-01 12:24:27 -07:00
ZappoMan
4b46fc3ad9
cleanup Model::renderPart()
2015-06-01 11:11:27 -07:00
ZappoMan
1b8572640b
more hacking sams tweaks
2015-06-01 09:07:32 -07:00
David Rowe
e41b4c1b7b
Add new address bar dialog error message
...
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
2015-06-01 09:01:11 -07:00
Sam Gateau
83c4a52454
Cleaning for PR
2015-05-31 19:34:03 -07:00
Sam Gateau
33d397a440
A fist update solution for the item
2015-05-31 19:10:37 -07:00
Sam Gateau
ddec8fd26f
Trying to find a good solution for update message & data
2015-05-30 13:57:05 -07:00
Sam Gondelman
c19115a485
actually fixed billboard
2015-05-29 16:53:01 -07:00
Sam Gondelman
4c83c6918d
fixed avatar billboards not displaying
2015-05-29 16:44:16 -07:00
Sam Gateau
7bde81e95f
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-29 15:50:31 -07:00
Sam Gateau
f04f3bda72
Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme
2015-05-29 15:44:14 -07:00
samcake
f8a90684ce
Merge pull request #5000 from huffman/scene-overlay
...
Team Teaching - Move overlay rendering to Scene pipeline
2015-05-29 15:31:46 -07:00
Sam Gateau
eef8077417
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-29 13:20:43 -07:00
Atlante45
d8168811b3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 19:58:22 +02:00
Howard Stearns
8e245ec4c2
getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step.
...
Otherwise entities never get to see end events.
Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).
2015-05-29 09:59:21 -07:00
Ryan Huffman
b21d0a3a53
Remove Overlays::renderWorld from Application
2015-05-29 09:40:03 -07:00
Sam Gateau
dd9cafcd09
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-28 18:14:41 -07:00
Sam Gateau
3f8bdc14c4
reinserting culling, lod and depth sort to the rendering
2015-05-28 18:01:31 -07:00
Brad Hefta-Gaub
1c3398f27e
Merge pull request #4991 from ZappoMan/team-teaching
...
TEAM TEACHING - merge from master
2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc
Undo the merge with the broken master checking. What could go wrong?
2015-05-28 13:48:27 -07:00
Howard Stearns
810c766f77
When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit.
2015-05-28 12:50:02 -07:00
ZappoMan
1029a8af7c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-28 12:38:16 -07:00
ZappoMan
a0e51469d3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-28 12:36:34 -07:00
ZappoMan
2fba5a0928
more work on simple renderable
2015-05-28 12:19:43 -07:00
ZappoMan
763e6dd97b
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-27 19:58:11 -07:00
Seth Alves
4fa6f388b9
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:20:59 -07:00
Ryan Huffman
c13254a9c4
Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-avatar
...
Conflicts:
interface/src/Application.cpp
2015-05-27 12:44:52 -07:00
Ryan Huffman
f972e84d6c
Move avatar renedering to Scene
2015-05-27 12:40:26 -07:00
Ryan Huffman
389d5556f5
Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer
2015-05-27 12:36:55 -07:00
Howard Stearns
4b4bf9fd90
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-27 09:29:06 -07:00
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -07:00
Sam Gateau
58e3fe695c
Refining once more for sir gcc on Ubuntu
2015-05-27 01:32:40 -07:00
Sam Gateau
a5c5cc9b70
First Item really rendering , for the WorldBox, desigining more of the RenderContext and task interface
2015-05-27 01:15:14 -07:00
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
ZappoMan
20ceb72d92
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-26 15:01:26 -07:00
Andrew Meadows
16e5710325
Merge pull request #4954 from ZappoMan/entitysmartpointers
...
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
Sam Gateau
e5755f52e5
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-26 13:57:10 -07:00
samcake
84525aabec
Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer
...
TEAM TEACHING BRANCH - Entity Smart Pointers
2015-05-26 13:56:47 -07:00
Howard Stearns
3c718af43f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-26 13:26:02 -07:00
Sam Gateau
ad0b0cfade
FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace
2015-05-26 11:40:35 -07:00
samcake
dd9d758da1
Fixing the compilation issue for real
2015-05-26 10:53:23 -07:00
Sam Gateau
0083ba6f85
trying again
2015-05-25 17:39:31 -07:00
Sam Gateau
ad054a640e
Fixing a problem with Mac/ubuntu build maybe
2015-05-25 17:21:03 -07:00
Howard Stearns
cbf4e09a10
Remove global collision event.
2015-05-25 16:10:50 -07:00
Sam Gateau
f0ab6d96f5
merge with upstream team-teaching
2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee
Insert a first scene and the engine in the Application and render a first Item
2015-05-24 17:03:43 -07:00
ZappoMan
9988f2d1cd
EnitityItem smart pointers
2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Ryan Huffman
47d9cf42c5
Remove unused lodManager
2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f
Update RenderArgs construction in paintGL
2015-05-22 16:02:24 -07:00
Ryan Huffman
d1a5662ca7
Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
Sam Gateau
a28c99bb40
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-22 14:40:00 -07:00
Sam Gateau
e7e3eb2b7c
FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter
2015-05-22 12:58:18 -07:00
