Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 10:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27607 commits 76 branches 59 tags 1.2 GiB
Commit graph

10145 commits

Author SHA1 Message Date
Brad Hefta-Gaub
d4f4580a7c Merge pull request #5152 from sethalves/fix-build 
fix debug build
 2015-06-17 16:27:58 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
David Rowe
67206332e6 Make individual reload buttons reload scripts 2015-06-17 16:11:30 -07:00
David Rowe
f220d40bb8 Re-download scripts upon Reload All 2015-06-17 16:11:25 -07:00
Bradley Austin Davis
1705eb8f80 Reverting some changes, putting overlay rendering in its own state manager 2015-06-17 16:08:19 -07:00
Brad Davis
f2261b5ed5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:34:50 -07:00
Brad Davis
2ab3f42c6a Merge pull request #5124 from venkatn93/master 
New address bar with forward and back buttons
 2015-06-17 15:33:10 -07:00
Seth Alves
15f156fcd2 Merge branch 'fix-build' of github.com:sethalves/hifi into actions-over-wire 2015-06-17 15:18:39 -07:00
Seth Alves
fbfa73af2d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 15:18:17 -07:00
Brad Davis
c8cc3a46b3 Merge remote-tracking branch 'origin/fix-gl-matrix' into overlay 2015-06-17 15:13:35 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Seth Alves
68df6b662d fix ifdefs around asserts 2015-06-17 15:03:09 -07:00
Bradley Austin Davis
a27e06713b Preserve the GL matrix stack when running batch commands 2015-06-17 14:57:14 -07:00
Seth Alves
44bb220130 fix debug build 2015-06-17 14:54:13 -07:00
Seth Alves
9a51a4c5b1 fix debug build 2015-06-17 14:48:37 -07:00
Seth Alves
22ac61e476 work around hiding of virtual functions in PolyVox entity classses 2015-06-17 14:40:24 -07:00
ZappoMan
f2ba91383c fix some warnings 2015-06-17 14:26:36 -07:00
Seth Alves
59389ce506 Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual 2015-06-17 14:18:47 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Niraj Venkat
9b9aba48f0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-17 13:50:30 -07:00
Philip Rosedale
196a1546ab Merge pull request #5135 from howard-stearns/not-clipped-local-sounds 
Don't clip local audio sounds
 2015-06-17 13:37:56 -07:00
Seth Alves
ac491dabdb Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 13:20:14 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Brad Davis
4282c044ef Working on mirror and overlay 2015-06-17 12:01:39 -07:00
Howard Stearns
b4dfaba55e Incorporate ctrlaltdavid's changes. 2015-06-17 11:59:15 -07:00
Seth Alves
3e758a8f43 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 11:53:12 -07:00
Seth Alves
85564199c6 git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point 2015-06-17 11:22:10 -07:00
Stephen Birarda
bc20ea6ed2 fix for path handling on return of place info 2015-06-17 11:18:43 -07:00
Brad Davis
5ded9e7eb9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 10:50:01 -07:00
Philip Rosedale
8b8f0bcbde Merge pull request #5132 from sethalves/polyvox 
Polyvox fixes
 2015-06-17 10:49:35 -07:00
Clément Brisset
d67d350e72 Merge pull request #5143 from ZappoMan/atmosphereBatchFix 
Change atmospheres to render using batch compatible pipeline and shaders
 2015-06-17 19:48:11 +02:00
Clément Brisset
42a5ddd116 Merge pull request #5144 from birarda/master 
make goToUser public again
 2015-06-17 19:27:29 +02:00
Stephen Birarda
dc4ae082f8 make goToUser public again 2015-06-17 10:13:53 -07:00
ZappoMan
fb59939cf4 CR feedback 2015-06-17 10:02:02 -07:00
ZappoMan
e9bf553254 CR feedback 2015-06-17 09:59:38 -07:00
ZappoMan
689e10cc27 build buster fix 2015-06-17 09:53:50 -07:00
ZappoMan
af5a910f58 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-17 09:36:16 -07:00
ZappoMan
8162c37013 cleanup 2015-06-17 09:33:15 -07:00
ZappoMan
268bb370cc cleanup 2015-06-17 09:24:42 -07:00
ZappoMan
0e18c75b0b cleanup 2015-06-17 09:23:12 -07:00
ZappoMan
ea98581d22 reorganize files to cleanup headers 2015-06-17 09:18:00 -07:00
Sam Gateau
3176c8e93c polish before PR 2015-06-17 17:09:33 +02:00
samcake
febc3333cd Solving the rendering of textured overlay3d 2015-06-17 16:50:35 +02:00
samcake
d703748ec3 trying to solve the rendering of overlay3d 2015-06-17 16:44:02 +02:00
Seth Alves
f5cea57a48 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-17 07:20:15 -07:00
Seth Alves
0ec7d3ded8 fix some float/double jumble 2015-06-17 07:02:54 -07:00
Sam Gateau
5c547037f2 Migrating the overaly 3d rendering in their own job and their own shader 2015-06-17 15:54:20 +02:00
samcake
cc65ad3ffb IMproving the JOb interface 2015-06-17 15:52:11 +02:00
Brad Davis
2bf53b625e Working on overlays and stats 2015-06-17 02:00:13 -07:00
Seth Alves
b8cf4ea29d use -Woverloaded-virtual with g++. quiet compiler warnings 2015-06-16 21:19:31 -07:00
Brad Davis
4762e1a00c Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-16 21:01:00 -07:00
Brad Davis
659fa2387c Working on overlays / stats 2015-06-16 21:00:13 -07:00
ZappoMan
569971582d more hacking on trying to port atmospheres to the new pipeline 2015-06-16 18:39:35 -07:00
Seth Alves
2ad25a2386 Merge branch 'master' of github.com:highfidelity/hifi into float-vs-double 2015-06-16 18:25:38 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
ZappoMan
722ac618f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-16 17:08:15 -07:00
Niraj Venkat
5fcf8e5922 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-16 16:34:38 -07:00
Seth Alves
0ef75da5d5 Merge pull request #5139 from ZappoMan/fixRayPicking 
fix FPS while still maintaining ray picking
 2015-06-16 16:17:42 -07:00
ZappoMan
6f0ae96f56 fix warning 2015-06-16 16:01:01 -07:00
Brad Hefta-Gaub
dfc3664469 Merge pull request #5131 from ericrius1/particleFix 
fixed particles not showing up by fixing billboarding code to account…
 2015-06-16 15:58:40 -07:00
ZappoMan
5abd608ccc fix typo 2015-06-16 15:55:37 -07:00
ZappoMan
1beb95cfe7 fix FPS while still maintaining ray picking 2015-06-16 15:38:16 -07:00
Seth Alves
49a68b4565 Merge pull request #5137 from murillodigital/auto-updater 
Fixing bug on platforms for which we don't release
 2015-06-16 15:31:48 -07:00
ZappoMan
167e7d1377 first cut at atmospheres in batch (doesn't work) 2015-06-16 14:05:14 -07:00
Andrew Meadows
7721f6de96 Merge pull request #5134 from birarda/master 
add goBack and goForward to AddressManager
 2015-06-16 13:50:20 -07:00
Leonardo Murillo
80ab2f31f4 typo 2015-06-16 14:49:55 -06:00
Leonardo Murillo
e1fb01e6dd Fixing bug on platforms for which we don't release 2015-06-16 14:49:19 -06:00
Stephen Birarda
e9bdf7e73a add missing bools to handleViewpoint call 2015-06-16 13:39:11 -07:00
Stephen Birarda
1af4b1c54c cleanup handleUrl call, add disabling of Menu items 2015-06-16 13:17:13 -07:00
Leonardo Murillo
917aa5db6d Code review changes 2015-06-16 13:21:40 -06:00
Brad Davis
02d33f6086 Working on overlay rendering 2015-06-16 12:14:42 -07:00
Leonardo Murillo
6fcdb83d46 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-16 12:54:32 -06:00
Howard Stearns
6d99d50f72 Don't clip local audio sounds (https://app.asana.com/0/32622044445063/37633564937422) 
and quiet some warnings (of https://app.asana.com/0/32622044445063/37620738098871).
 2015-06-16 10:51:42 -07:00
Seth Alves
d7eddc398b don't make changes if the polyvox is locked 2015-06-16 10:14:01 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Niraj Venkat
de13fe85fe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-16 09:50:37 -07:00
Seth Alves
e98b28c1d8 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-16 09:32:53 -07:00
ericrius1
70e042085b fixed indentation 2015-06-16 09:11:36 -07:00
Stephen Birarda
ef62f7e9f0 fix relative path lookup effect on history 2015-06-16 08:46:04 -07:00
Stephen Birarda
8e46043f14 add fixed back/forward, buttons to menu 2015-06-16 08:41:21 -07: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
e4d0090939 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-16 15:01:24 +02:00
Sam Gateau
9be87758fd Improving the design of the Jobs and varying 2015-06-16 15:00:47 +02:00
Seth Alves
6def25de92 formatting 2015-06-15 16:22:06 -07:00
Brad Davis
07845df4dc Merge remote-tracking branch 'upstream/master' into overlay 2015-06-15 16:13:51 -07:00
Brad Davis
1bae590389 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
 2015-06-15 16:13:02 -07:00
Seth Alves
445381bb6b fix DEFAULT_VOXEL_DATA, recompress voxel data when a script calls setVoxel. Use provided transform when rendering. 2015-06-15 16:07:28 -07:00
Seth Alves
4a00bd3e7f quiet compiler 2015-06-15 16:06:20 -07:00
ericrius1
67ed1369cc fixed indentation 2015-06-15 15:04:38 -07:00
ericrius1
2663e5a876 correct particle count for systems without textures 2015-06-15 14:43:13 -07:00
eric levin
27c6190665 fixed particles not showing up by fixing billboarding code to account for new winding order 2015-06-15 14:24:18 -07:00
ZappoMan
1c3b484466 fix detailed ray picking against models 2015-06-15 12:48:51 -07:00
Seth Alves
5f3b902798 remove debugging print 2015-06-15 11:24:29 -07:00
Seth Alves
c1668553fd make sure that the root node always appends an entity count (even if it's zero). This keeps the unreasonably-deep-recursion warnings from happening 2015-06-15 11:22:07 -07:00
Leonardo Murillo
c065269ba7 Merging with upstream 2015-06-15 11:58:52 -06:00
Sam Gateau
38694e4f65 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-14 18:56:34 +02:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
Brad Davis
49f4ab99df Revert "Revert "Fix broken identity transforms on OSX"" 
This reverts commit 1feceec0c7.
 2015-06-13 10:03:10 -07:00
Brad Davis
737e418878 Revert "Revert "Merge pull request #5106 from jherico/render_cursor"" 
This reverts commit 0cdc2b53fe.
 2015-06-13 10:02:54 -07:00
Brad Davis
dac4a242c1 Removing cruft 2015-06-12 19:47:05 -07:00
Niraj Venkat
428b80a50d Removing old debug print code 2015-06-12 17:49:07 -07:00
Niraj Venkat
df8e1ac467 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-12 17:46:58 -07:00
Brad Davis
15d214f335 Initial pass at OpenVR 2015-06-12 17:29:05 -07:00
Philip Rosedale
c834937472 Merge pull request #5122 from huffman/fix-rear-view-mirror 
Fix rear view mirror
 2015-06-12 15:49:38 -07:00
Brad Davis
7955eeda28 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-06-12 15:49:35 -07:00
Niraj Venkat
fcd4dd32ef Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-12 14:08:33 -07:00
Niraj Venkat
b9b8cfd60d Starting the new address bar layout 2015-06-12 14:08:06 -07:00
Philip Rosedale
b628df45bc Merge pull request #5121 from ZappoMan/attemptRevertOverlaysBork2 
REVERT recent changes to overlays that seem to be breaking stuff
 2015-06-12 13:50:53 -07:00
Ryan Huffman
81d003bdb8 Add post-scale to view matrix when in mirror mode 2015-06-12 13:05:10 -07:00
Ryan Huffman
66a65e3675 Update model to select clockwise backface culling program when in mirror mode 2015-06-12 13:04:02 -07:00
Ryan Huffman
ad77374732 Fix setting of _renderMode 2015-06-12 13:03:33 -07:00
ZappoMan
1feceec0c7 Revert "Fix broken identity transforms on OSX" 
This reverts commit 9262839564.
 2015-06-12 12:57:37 -07:00
ZappoMan
0cdc2b53fe Revert "Merge pull request #5106 from jherico/render_cursor" 
This reverts commit 4d18bd7cec, reversing
changes made to 24fda9a733.
 2015-06-12 12:57:24 -07:00
ZappoMan
becd9646f2 Merge branch 'master' of https://github.com/highfidelity/hifi into cullingBugs 2015-06-12 11:43:08 -07:00
ZappoMan
7d7db65fd1 fix avatar mesh boxes not staying in sync with avatar position 2015-06-12 11:42:38 -07:00
Brad Hefta-Gaub
a5b28660ad Merge pull request #5113 from Atlante45/debug 
Fix text entities wrapping
 2015-06-12 11:23:31 -07:00
Brad Hefta-Gaub
b11b1d408b Merge pull request #5116 from jherico/osx_overlay_fix 
Fix broken identity transforms on OSX
 2015-06-12 10:59:37 -07:00
Atlante45
30ae78e3b6 Rename getRowHeight 2015-06-12 19:50:32 +02:00
Atlante45
26dd067982 Advance with _leading on y 2015-06-12 19:44:40 +02:00
Atlante45
f3d3bd7bec Remove _rowHeight 2015-06-12 19:44:15 +02:00
Bradley Austin Davis
9262839564 Fix broken identity transforms on OSX 2015-06-12 10:33:52 -07:00
Clément Brisset
e4511e37f5 Merge pull request #5111 from ZappoMan/cullingBugs 
hack to fix culling bugs for some subMesh parts in the windmill scene
 2015-06-12 18:53:46 +02:00
ZappoMan
c17ae593f0 CR feedback 2015-06-12 09:04:16 -07:00
Atlante45
228f8c2e61 Fix a few items rendering without pipeline 2015-06-12 17:34:16 +02: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
Atlante45
565bf8bcb2 Fix text entities wrapping 2015-06-12 15:41:37 +02:00
ZappoMan
2fc0233096 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:50:31 -07:00
ZappoMan
feb3f68a00 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:49:19 -07:00
Howard Stearns
27f40ea881 Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
Brad Hefta-Gaub
c0deff9fdc Merge pull request #5097 from jherico/cursor_manager 
Cursor manager first pass
 2015-06-11 18:05:43 -07:00
Brad Hefta-Gaub
c27c20c142 Merge pull request #5109 from birarda/master 
fix for sticking windows audio-mixer
 2015-06-11 17:39:55 -07:00
Brad Davis
09cfe004a1 Combining with new cursor render code 2015-06-11 16:55:23 -07:00
Niraj Venkat
9a193acfa0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-11 16:28:16 -07:00
Niraj Venkat
366be3c0c0 Check if entity looked at has valid hyperlink href attached 2015-06-11 16:27:50 -07:00
Brad Davis
9148b866bb Merge branch 'render_cursor' into cursor_manager 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-11 16:19:57 -07:00
Stephen Birarda
f45c2a3e56 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-11 15:49:12 -07:00
Brad Davis
b7cd1ea72a Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 15:04:56 -07:00
Brad Hefta-Gaub
24fda9a733 Merge pull request #5085 from SamGondelman/master 
Exposing Input Key Binding To JavaScript
 2015-06-11 14:41:34 -07:00
Andrew Meadows
a3c5ea1b58 Merge pull request #5088 from sethalves/actions 
spring action with rotation and position target, rework grab script to use it
 2015-06-11 13:23:57 -07:00
Seth Alves
8ed9a3ca02 add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07: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
Brad Hefta-Gaub
684e93cf42 Merge pull request #5105 from Atlante45/debug 
Fix zones wireframe rendering
 2015-06-11 10:17:28 -07:00
ZappoMan
a878559e0c fix transforms for items with non-default registration point 2015-06-11 09:38:45 -07:00
ZappoMan
47888b4671 fix transforms for items with non-default registration point 2015-06-11 09:34:56 -07:00
Atlante45
f4f5f16758 Fix zones wireframe rendering 2015-06-11 18:34:39 +02:00
ZappoMan
55ede2b398 Merge branch 'master' of https://github.com/highfidelity/hifi into bugfix 2015-06-11 09:10:05 -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
Brad Davis
fa27550df4 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 02:21:02 -07:00
Clément Brisset
d448a3be7f Merge pull request #5101 from ZappoMan/fix-attachments 
Get avatar attachments rendering again
 2015-06-11 10:35:49 +02:00
Seth Alves
ba4fd7adf6 windows didn't like EntityActionFactoryInterface::factory not returning an error 2015-06-10 19:23:01 -07:00
Seth Alves
4216308b9b Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
ZappoMan
93c0bd63e9 fix debug rendering transforms 2015-06-10 18:54:07 -07:00
Seth Alves
45c7cd4929 respond to code review, add a simple hold-a-stick script 2015-06-10 18:48:51 -07:00
Seth Alves
eccf4eb8a8 hold action works 2015-06-10 17:05:49 -07:00
ZappoMan
e06422825a mostly getting attachments working again 2015-06-10 15:46:54 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Andrew Meadows
2f32d358c3 merge 2015-06-10 15:27:08 -07:00
Sam Gateau
1f62fb4b6f Adding standard vertex and pixel shaders for drawing texture in applicationOverlay 2015-06-10 15:24:29 -07:00
Andrew Meadows
6497ac6c82 renderBoundingBox() for sim-ownership debug 2015-06-10 14:24:00 -07:00
Brad Davis
7f6a49688a Merge branch 'master' into plugins 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Environment.cpp
	interface/src/Environment.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationOverlay.h
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-06-10 14:21:48 -07:00
Leonardo Murillo
3bd0c7bd87 Code Review changes 2015-06-10 14:35:52 -06:00
Brad Davis
55ed94a5af Merge remote-tracking branch 'upstream/master' into cursor_manager 2015-06-10 13:27:07 -07:00
Brad Davis
ca1af77763 Working on cursor manager 2015-06-10 13:24:56 -07:00
Leonardo Murillo
3708f5ec96 Code Review changes 2015-06-10 14:15:26 -06:00
Leonardo Murillo
869461a01b Code Review changes 2015-06-10 14:14:00 -06:00
Niraj Venkat
182a3e918c Hyperlink properties now propagate locally and over network 2015-06-10 13:12:18 -07:00
Andrew Meadows
0e12cdc39e woops, forgot to include this in last commit 2015-06-10 12:41:15 -07:00
Andrew Meadows
8d41960cc3 reset simulation bid counters on object activation 2015-06-10 12:40:14 -07:00
Leonardo Murillo
8f72763f17 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-10 13:18:20 -06:00
Seth Alves
3dcc6c9b8c make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus. 2015-06-10 12:04:44 -07:00
Sam Gateau
780547b6c7 Merge branch 'render_cursor' of https://github.com/jherico/hifi into yellow 2015-06-10 11:35:55 -07:00
Brad Davis
863402aea2 Merge branch 'master' into cursor_manager 2015-06-10 10:20:57 -07:00
Niraj Venkat
c45d409383 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-10 09:51:17 -07:00
Clément Brisset
059b29da83 Merge pull request #5090 from ericrius1/lineClamping 
clamping line points between 0 and TREE_SCALE
 2015-06-10 18:04:10 +02:00
Brad Davis
5e279367b7 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-10 08:57:45 -07:00
ZappoMan
aa05d9f67c Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments 2015-06-10 08:53:33 -07:00
Clément Brisset
73fce52407 Merge pull request #5091 from birarda/master 
store an in-memory history of the last addresses
 2015-06-10 17:52:39 +02:00
Eric Levin
286b7bf573 changed comment to use TREE_SCALE instead of 16000 2015-06-10 08:48:26 -07:00
Brad Davis
94c414e4e8 Add unit quad, commonly used in compositing the overlays 2015-06-10 08:12:58 -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
470e24820d Back to clean state, just added the Material Key 2015-06-10 00:31:36 -07:00
Stephen Birarda
1112841586 fix indentation in AddressManager 2015-06-09 19:01:03 -07:00
Stephen Birarda
8b67710022 store an in-memory history of the last addresses 2015-06-09 18:59:58 -07:00
Eric Levin
f51b1d2ac2 clamping line points between 0 and TREE_SCALE 2015-06-09 17:30:15 -07:00
Andrew Meadows
4df87ec4e8 fix rendering of simulation ownership debug info 2015-06-09 17:23:37 -07:00
Seth Alves
b1a209b9db pull some common code out of subclasses and into ObjectAction 2015-06-09 16:17:48 -07:00
Seth Alves
23dab530f9 fix some glitchy behavior during rotation 2015-06-09 14:11:01 -07:00
ZappoMan
2c6ebcb06a remove a bunch of cruft from Model 2015-06-09 12:57:14 -07:00
ZappoMan
ba0cecb356 remove attachments from Model - only supported at avatar layer 2015-06-09 12:32:37 -07:00
Sam Gateau
7de4c2eff7 first take on the materialKey 2015-06-09 12:17:10 -07:00
Niraj Venkat
a577d7955c Removed classes and the "hyperlink entity" 2015-06-09 11:27:57 -07:00
Seth Alves
ccb2f17b33 grab.js rotation sort-of works now 2015-06-09 11:21:13 -07:00
Niraj Venkat
2bb1bf8afe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-09 10:33:39 -07:00
Niraj Venkat
1bf0b15bb0 Removing unnecessary files 2015-06-09 10:33:05 -07:00
Niraj Venkat
0004b1a81c Reversing previous entity work and creation of property group 2015-06-09 10:32:25 -07:00
Brad Davis
7b355fe69f Removing build of oglplus and boostconfig on non-Windows 2015-06-09 10:29:10 -07:00
Seth Alves
42f94307d5 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-09 09:51:29 -07:00
Leonardo Murillo
1d785c714b Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-09 09:01:50 -06:00
Brad Hefta-Gaub
759a4a323b Merge pull request #5087 from Atlante45/debug 
Reduce debug on domain connection
 2015-06-09 07:54:21 -07:00
Atlante45
bf56ee49a6 Print new URL only when it actually changes 2015-06-09 16:37:48 +02:00
Atlante45
90c9a82aeb Remove unnecesary debug 2015-06-09 15:27:08 +02:00
Atlante45
303026d86b Reduce qDebug calls 2015-06-09 15:26:41 +02:00
Brad Davis
5680d58a19 Removing oglplus requirement for linux and mac 2015-06-09 03:09:10 -07:00
Brad Davis
e9587d90c4 Trying to fix linux build 2015-06-09 01:50:32 -07:00
Brad Davis
6147844f93 Merge branch 'master' into ovr6 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.h
 2015-06-09 00:44:06 -07:00
Brad Davis
873f73ffb4 Working on cursor manager 2015-06-09 00:39:49 -07:00
Seth Alves
fb7a0e7219 back out previous change, fix error where translucent is used instead of translucentMesh 2015-06-08 22:41:59 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Seth Alves
14a45e8349 convert grab.js to use spring action. rotation doesn't work right, yet 2015-06-08 18:25:58 -07:00
Seth Alves
eb85f7f818 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-08 17:37:56 -07:00
Brad Davis
90c18d0c48 Merge pull request #5080 from ZappoMan/team-teaching 
Merge TEAM-TEACHING into MASTER
 2015-06-08 17:34:42 -07:00
Seth Alves
b3bc9c3ef0 first attempt at getting spring-action to handle rotation 2015-06-08 17:10:13 -07:00
Niraj Venkat
dbb447c9b5 Exposing Hyperlink type to javascript 2015-06-08 16:09:06 -07:00
Howard Stearns
8e41c58fad Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound 2015-06-08 15:45:30 -07:00
Niraj Venkat
63665d720a Fixed bug by adding hyperlink props to flags. Safe to merge 2015-06-08 15:32:21 -07:00
Howard Stearns
564b0b48ef Alternate version that uses signal rather than polling. 2015-06-08 14:29:43 -07:00
Seth Alves
1e858d8bc5 start on spring action 2015-06-08 14:16:03 -07:00
Leonardo Murillo
bd16072053 Conflict fixing 2015-06-08 15:00:06 -06:00
Leonardo Murillo
7aee293df4 Buttons are connected and execting old functions 2015-06-08 14:56:46 -06:00
ZappoMan
24c8e7d0e6 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 13:50:50 -07:00
Niraj Venkat
cd93128236 [ERRORS] Starting on hyperlink entity and properties 2015-06-08 13:29:54 -07:00
Leonardo Murillo
bd85ce1312 Auto Update checkpoint - dialog is QML and populated with real data 2015-06-08 13:55:28 -06:00
ZappoMan
26ef6af009 use emplace_back and pre-reserved sizes for vectors 2015-06-08 12:45:39 -07:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
Sam Gateau
87536b2f9d Fixing the skinning issue 2015-06-08 11:22:16 -07:00
Leonardo Murillo
83b7054138 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-08 11:55:47 -06:00
Howard Stearns
6668de56cd Fix AudioInjector::restart() for the non-local case. 2015-06-08 10:34:56 -07:00
samcake
d9b7a42f60 FIxing merge 2015-06-08 19:06:04 +02:00
Brad Hefta-Gaub
ec55aa74ff Merge pull request #5069 from samcake/daft 
TEAM TEACHING : Improving the transparent rendering
 2015-06-08 09:48:32 -07:00
samcake
cc55056eef Merge pull request #5070 from ZappoMan/team-teaching-drawperf 
TEAM TEACHING - cache the Item bounds across sub tasks
 2015-06-08 18:42:34 +02:00
samcake
5e351c0328 FIxing the transparent rendering on Mac 2015-06-08 18:36:12 +02: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
samcake
1bff9a17e1 Fixing compilation issues and shader issues on Mac, not fully fixing the transparency though 2015-06-08 17:05:28 +02:00
Sam Gateau
8a93db6f5a more typos and issues on mac 2015-06-08 07:25:32 -07:00
Sam Gateau
862d6abd79 Typo on mac build 2015-06-08 06:57:04 -07:00
Sam Gateau
b7d88e2642 add apotential fix to the issue with viewInverse for Legacy transform path support 2015-06-08 06:46:45 -07:00
Sam Gateau
c47cee3f3b clean code for PR 2015-06-08 05:59:10 -07:00
Sam Gateau
054809d570 clean code for PR 2015-06-08 05:51:23 -07:00
Sam Gateau
3196c5ca77 better highlights blending 2015-06-08 05:41:36 -07:00
Sam Gateau
5e04b399d8 fixing the wrong matrix used 2015-06-08 03:07:17 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Bradley Austin Davis
5a52a389be Working on SDK 0.6 2015-06-07 23:23:21 -07:00
Brad Davis
119f37a178 Working on SDK 0.6 2015-06-07 14:34:40 -07:00
Bradley Austin Davis
b56fbd4744 Working on SDK 0.6 2015-06-07 13:56:06 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6 
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
 2015-06-07 01:40:44 -07:00
Sam Gateau
8d3a3221b0 shuffling the rendering steps to get to render transparent and light it correctly 2015-06-06 09:50:56 -07:00
Niraj Venkat
141ff70a60 Some changes to constants 2015-06-05 15:36:42 -07:00
Leonardo Murillo
2236ccf0e1 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-05 16:18:03 -06:00
Leonardo Murillo
dea80d1757 Styling update dialog and working towards passing build details from c++ to qml 2015-06-05 16:17:54 -06:00
Brad Davis
aac527f32c Merge remote-tracking branch 'upstream/master' into plugins 2015-06-05 13:49:37 -07: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
08ea3368d7 hacking on DrawTask perf 2015-06-05 13:10:51 -07:00
Brad Hefta-Gaub
42202e749d Merge pull request #5065 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-06-05 12:42:46 -07:00
ZappoMan
7dc0e8a66c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 12:21:29 -07:00
Brad Hefta-Gaub
202e39799a Merge pull request #5062 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-06-05 12:21:10 -07:00
ZappoMan
35f40df6e2 fix build buster 2015-06-05 12:06:13 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Seth Alves
b0480af040 Merge pull request #5053 from AndrewMeadows/isothermal 
fix crash during bogus reconnect on login
 2015-06-05 11:38:23 -07:00
Seth Alves
aff582287d use const references for arguments in action-related calls 2015-06-05 11:26:54 -07:00
ZappoMan
f8a2fff5a7 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:06:10 -07:00
Brad Hefta-Gaub
4c52076e13 Merge pull request #5063 from huffman/fix-entity-delete-payload 
Team Teaching - Fix entity payloads not being removed on delete
 2015-06-05 11:03:46 -07:00
Andrew Meadows
53fa6cf0b2 Merge pull request #5040 from jherico/web-entities-fix 
Fixing web entity glow and 'back' behavior
 2015-06-05 10:46:58 -07:00
Niraj Venkat
a2165e3a8a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 10:42:20 -07:00
Seth Alves
28c034698f Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-05 10:41:20 -07:00
Seth Alves
c5143cdfa0 Merge pull request #5027 from AndrewMeadows/isentropic 
cleanup around sending all "terse update" data whenever some of it changes
 2015-06-05 10:41:06 -07:00
Niraj Venkat
c8236f867b Address manager changes to support domain ID 2015-06-05 10:40:17 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85 Merge pull request #5037 from AndrewMeadows/inertia 
collision groups for physical objects
 2015-06-05 10:26:28 -07:00
Ryan Huffman
37d9394140 Fix entity payloads not being removed on delete 2015-06-05 10:26:09 -07:00
Seth Alves
51f5730e68 formatting 2015-06-05 10:05:11 -07:00
Seth Alves
eb912892dc code review 2015-06-05 09:56:34 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Brad Hefta-Gaub
4bbde3d724 Merge pull request #5058 from huffman/entity-update-url 
TEAM TEACHING - Fix model entities correctly updating payloads when url changes
 2015-06-05 09:27:36 -07:00
Ryan Huffman
b22ed34825 Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset 
TEAM TEACHING - improvements to avatar part clipping
 2015-06-05 09:26:45 -07:00
ZappoMan
d60810e221 CR feedback 2015-06-05 09:10:38 -07:00
Seth Alves
2086a25f93 oops 2015-06-05 08:59:19 -07:00
Seth Alves
086b9d404a fix return-type in lambda 2015-06-05 08:59:08 -07:00
Leonardo Murillo
01236e0159 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-05 09:48:44 -06:00
Ryan Huffman
9814d11bea Fix model entities correctly updating payloads when url changes 2015-06-05 08:45:31 -07:00
Andrew Meadows
9cb7cb314d update minimum version support 2015-06-05 08:43:48 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume 
Smooth initial crash volume
 2015-06-05 08:40:09 -07:00
Brad Hefta-Gaub
ba5eab7460 Merge pull request #5057 from Atlante45/team-teaching 
Team Teaching - Transform to polyvox corner for render
 2015-06-05 07:48:28 -07:00
Seth Alves
3dbf28b7b4 use lambdas to remove some repeated code 2015-06-05 07:33:39 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Atlante45
260272d288 Transform to polyvox corner for render 2015-06-05 14:32:47 +02:00
Clément Brisset
5f16b8752b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 
Conflicts:
	libraries/entities-renderer/src/RenderableEntityItem.cpp
	libraries/render-utils/src/Model.cpp
 2015-06-05 13:28:42 +01:00
Clément Brisset
f19c0d8eec Some renaming for windows compiler 2015-06-05 13:23:58 +01:00
Sam Gateau
aa5e6fa1b0 merging 2015-06-05 00:41:29 -07:00
Brad Davis
1b7efe9a02 Working on display plugins 2015-06-05 00:00:57 -07: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
Seth Alves
ba42b0dcc4 updateAction and deleteAction 2015-06-04 17:51:59 -07:00
Andrew Meadows
911baee8b8 fix for crash during bogus reconnect on login 2015-06-04 16:57:29 -07:00
Andrew Meadows
cd6bf9d461 cleanup comments 2015-06-04 16:56:14 -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
ZappoMan
5146e51d9f improvements to avatar part clipping 2015-06-04 16:44:46 -07:00
Sam Gondelman
984d449bf9 exposed input key bindings to js to enable key remapping 2015-06-04 16:29:58 -07:00
Ryan Huffman
cafc5b7a7c Merge pull request #5049 from ZappoMan/team-teaching-optimize-offset 
TEAM TEACHING - avatar changing model URLs
 2015-06-04 14:29:44 -07:00
Howard Stearns
407d3b6a6e Pitch is dependent on (largest dimension of) minimum bounding, not max. 
Adjust sound range of full volume.
 2015-06-04 14:23:51 -07:00
Howard Stearns
5cbb5dadca More perspicacious zero. 2015-06-04 14:21:12 -07:00
Brad Hefta-Gaub
5e6771d91a Merge pull request #5048 from huffman/entity-visible 
Team Teaching - Update entity payload items to not render when entity.visible == false
 2015-06-04 14:12:49 -07:00
Ryan Huffman
5af52048ec Add render/Scene.h include to Model.h 2015-06-04 13:45:10 -07:00
ZappoMan
56ac987c9b handle url reloading at the model level, this addresses avatars changing their models 2015-06-04 13:40:43 -07:00
Ryan Huffman
a62b55fcb2 Update entity payload items to correctly hide when not visible 2015-06-04 13:25:40 -07:00
Seth Alves
5e5bc497d9 remove debugging prints 2015-06-04 12:44:08 -07:00
Seth Alves
5f60ad3b51 put back unused variables as commented out -- there is a comment lower down that talks about them 2015-06-04 12:39:48 -07:00
Seth Alves
66ab3d455f use shared pointers to keep track of action objects 2015-06-04 12:29:05 -07:00
Seth Alves
8f19bad97d pull argument extracting code into EntityActionInterface 2015-06-04 11:39:15 -07:00
ZappoMan
3593afea3b optimize part offset calculation 2015-06-04 11:37:02 -07:00
Andrew Meadows
6b03e671d8 remove comment cruft 2015-06-04 11:28:07 -07:00
Andrew Meadows
aff751b4e6 remove old debug assert 2015-06-04 11:26:35 -07:00
Andrew Meadows
0514736a3e remove last of *InDomainUnits code 2015-06-04 11:24:10 -07:00
Seth Alves
14026667f5 script interface for creating an action now takes an action-type name rather than having a different call for each action 2015-06-04 10:55:32 -07:00
Andrew Meadows
6ea4c58319 material changes are an "easy" property to update 2015-06-04 10:22:01 -07:00
Seth Alves
9cae11cc3c clean up actions when DeleteEntityOperator's list is processed rather than as it's made 2015-06-04 09:55:25 -07:00
Atlante45
94ba84a84c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:48:15 +02:00
Atlante45
93b44e6846 Collect stats on translucent/opaque mesh parts 2015-06-04 18:46:47 +02:00
Seth Alves
57d85cece0 get rid of simulation back-pointer in actions 2015-06-04 09:41:32 -07:00
ZappoMan
d2deef97cc Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-04 09:24:37 -07:00
Brad Hefta-Gaub
50f44c801a Merge pull request #5045 from Atlante45/fix_world_box 
Team Teaching - Temporary fix for models index offset
 2015-06-04 09:16:31 -07:00
Atlante45
8e21d9c14b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:11:17 +02:00
Howard Stearns
0b52f85c60 Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-initial-crash-volume 2015-06-04 09:10:42 -07:00
Clément Brisset
7ffe7b31a6 Merge pull request #5041 from ZappoMan/team-teaching-all-entities 
TEAM TEACHING - overlays and entities, fix to shrunken avatars
 2015-06-04 18:00:44 +02:00
Atlante45
31d257db09 Temporary fix for models index offset 2015-06-04 17:58:44 +02:00
ZappoMan
c4756f4816 remove dead code 2015-06-04 08:49:26 -07:00
ZappoMan
4b389793ad CR feedback 2015-06-04 08:42:10 -07:00
Atlante45
a4340b17e9 Remove deprecated render stats 2015-06-04 14:47:04 +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
ab9cfac672 Restore line width 2015-06-04 11:35:41 +02:00
Atlante45
78e9c5870b Line updateGeometry in render 2015-06-04 10:56:48 +02:00
Atlante45
504be28143 Remove unused variables 2015-06-04 10:55:51 +02:00
Atlante45
166eff7df1 Fix line entity rendering 2015-06-04 10:54:57 +02:00
Atlante45
e421485908 Add glLineWidth to Batch/GLBackend 2015-06-04 10:54:13 +02:00
Brad Davis
edfb1305af Merge remote-tracking branch 'upstream/master' into plugins 2015-06-04 00:29:39 -07:00
Brad Davis
8366d51217 Merge branch 'web-entities-fix' into plugins 2015-06-04 00:29:31 -07:00
Sam Gateau
fabe8f1a7a Fixing the skinned mesh rendering issue 2015-06-03 23:18:24 -07:00
Sam Gateau
dfa8cb5c80 Fixing the skinned mesh rendering issue 2015-06-03 23:11:14 -07:00
ZappoMan
54c4cb829a fixed the shrunken avatar part bug 2015-06-03 21:49:48 -07:00
ZappoMan
042384c5e2 light rendering as payload 2015-06-03 20:46:47 -07:00
Seth Alves
4414b67837 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-03 20:43:22 -07:00
Seth Alves
31bc106189 remove unneeded include 2015-06-03 20:43:11 -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
Seth Alves
d634663bb1 simple action is working. destructor sequense is still suspicous 2015-06-03 17:33:55 -07:00
Brad Davis
a12fd5c3d0 Merge pull request #5023 from AndrewMeadows/bispinor 
fix crash in ~OffscreenGlCanvas on linux shutdown
 2015-06-03 17:21:39 -07:00
ZappoMan
c6fb22b915 make sure all entities are rendering in pipeline part 1 2015-06-03 17:16:45 -07:00
Brad Davis
7f0a7b4f7e Fixing web entity glow and 'back' behavior 2015-06-03 17:15:50 -07:00
Brad Davis
17ebcdd1be Working on display plugins 2015-06-03 17:15:00 -07:00
ZappoMan
7fde574a2a make model overlays acutally use sub mesh payload items 2015-06-03 16:33:58 -07:00
Andrew Meadows
b0ca2df3aa move API from PhysicsEngine to ObjectMotionState 2015-06-03 14:56:04 -07:00
Andrew Meadows
8e61a10bcf compute collision group for entity 2015-06-03 14:22:48 -07:00
Andrew Meadows
ec0b4a956a move collision group consts to shared lib 2015-06-03 14:13:51 -07:00
Andrew Meadows
a989998816 fix typo in comment 2015-06-03 14:13:30 -07:00
Seth Alves
9861e8afcc adjust assert 2015-06-03 11:47:42 -07:00
Andrew Meadows
7b6cc59d30 basic support for collision groups 2015-06-03 11:40:48 -07:00
Sam Gateau
730d455095 adding a debug tool 2015-06-03 11:35:37 -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
Seth Alves
c8ab22c517 hook up entity-scripting-interface to actions 2015-06-03 11:19:45 -07:00
Seth Alves
57c3a14b6a quiet compiler 2015-06-03 11:18:38 -07:00
Atlante45
7654533888 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:51 +02:00
Howard Stearns
407746b842 Fix (consistent) typo in non-magic-number constant's name. 2015-06-03 10:38:20 -07:00
Howard Stearns
c036b5fd4b Actually commit the changes this time! 2015-06-03 10:19:28 -07:00
ZappoMan
7c40b666e8 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-03 09:52:40 -07:00
Leonardo Murillo
ef27a7660c Checkpoint: AutoUpdate reads data from builds.xml and stores it in a QMap 2015-06-03 10:31:33 -06:00
Seth Alves
1d0d002222 clear out action change lists after applying them 2015-06-03 09:10:42 -07:00
Atlante45
9df1b05184 Introduce outsideEngineDetails 2015-06-03 18:08:43 +02: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
Brad Davis
a663771853 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-03 00:17:52 -07:00
Brad Davis
3d5c9151fd Working on oculus overlay 2015-06-03 00:17:45 -07:00
ZappoMan
9e7f60e6a3 add more guards against out of bounds 2015-06-02 22:17:39 -07:00
ZappoMan
a7feca0727 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:00 -07:00
ZappoMan
647d132d57 store part boxes in model space and translate to world space on request 2015-06-02 21:50:33 -07:00
ZappoMan
c9c434bc8c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-06-02 21:04:33 -07:00
ZappoMan
adcb62eb18 more hacking and cleanup 2015-06-02 21:03:34 -07: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
Sam Gateau
8bf08b34d7 Trying to get Ubuntu to build... again 2015-06-02 19:37:54 -07:00
Sam Gateau
eea7ddf491 Trying to get Ubuntu to build 2015-06-02 19:27:32 -07:00
Leonardo Murillo
4b316c6937 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-02 19:32:19 -06: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
Andrew Meadows
acb3163f43 add comments for future work 2015-06-02 17:20:41 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -07:00
Seth Alves
f84e970c48 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-02 16:28:07 -07:00
Seth Alves
d6549948d0 first pass at entity interface to actions 2015-06-02 16:06:27 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
Andrew Meadows
0e2028b820 merge 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2015-06-02 15:08:36 -07:00
Sam Gateau
3c7eb4de6d merging with upstream 2015-06-02 14:48:53 -07:00
Andrew Meadows
9e0c2a3c6c fix crash in ~OffscreenGlCanvas on linux shutdown 2015-06-02 14:36:34 -07:00
Andrew Meadows
2702e07863 Merge pull request #5015 from sethalves/polyvox 
PolyVox improvements -- depends on #5008
 2015-06-02 14:34:49 -07:00
Sam Gateau
453fa87654 making sure the proj and view matrix are correctly assigned 2015-06-02 14:31:40 -07:00
Brad Hefta-Gaub
2a8e758559 Merge pull request #5010 from ericrius1/lineEntity 
Modified the line entity to take two new properties: lineWidth and linePoints
 2015-06-02 14:25:44 -07:00
Eric Levin
7527efc2d6 removed unsuded variable 2015-06-02 13:58:09 -07:00