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

12443 commits

Author SHA1 Message Date
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
de268c47b3 Working on 0.6 2015-06-07 18:25:16 -07:00
Bradley Austin Davis
6a60da2a6c Working on SDK 0.6 2015-06-07 17:58:33 -07:00
Brad Davis
119f37a178 Working on SDK 0.6 2015-06-07 14:34:40 -07:00
David Rowe
77f2943877 Rename previous Dialog to VrDialog 2015-06-07 13:57:03 -07:00
David Rowe
6f7c52d2cc Rename new Dialog to DialogContainer 2015-06-07 13:57:02 -07:00
David Rowe
8c1ece8865 Fix #include for Unix 2015-06-07 13:57:02 -07:00
David Rowe
36312e7bb4 Remove circular login dialog variation 2015-06-07 13:57:01 -07:00
David Rowe
b1f2ffd008 Code review and tidying 2015-06-07 13:57:00 -07:00
David Rowe
dbe57696d8 Replace login background SVGs with QML rectangles 2015-06-07 13:56:59 -07:00
David Rowe
84ab8277df Add spinner in place of "Logging in..." 2015-06-07 13:56:59 -07:00
David Rowe
8682cfc14a Change login password recovery link text 2015-06-07 13:56:58 -07:00
David Rowe
34209fa671 Remove unnecessary semicolons 2015-06-07 13:56:58 -07:00
David Rowe
263f305349 White error text instead of black 2015-06-07 13:56:57 -07:00
David Rowe
7819b5b5c3 Fix setting focus at start-up when not logged in 2015-06-07 13:56:56 -07:00
David Rowe
162395e7fe Make login password and register links work 2015-06-07 13:56:56 -07:00
David Rowe
ed60e409ab Make login dialog able to be dragged 2015-06-07 13:56:55 -07:00
David Rowe
2a40bbb02b Add remainder of dialog content and polish look 2015-06-07 13:56:54 -07:00
David Rowe
a2f262f659 Add basic username, password, login, and error functionality and styling 2015-06-07 13:56:54 -07:00
David Rowe
511832c273 New login dialog background with circular and rectangular variations 
Developer menu item toggles between the two.
 2015-06-07 13:56:53 -07:00
David Rowe
811c250763 Refactor common new dialog functionality into new Dialog.qml 2015-06-07 13:56:52 -07:00
David Rowe
4d8bc27ece Rename Dialog.qml to DialogOld.qml 2015-06-07 13:56:52 -07:00
Bradley Austin Davis
b56fbd4744 Working on SDK 0.6 2015-06-07 13:56:06 -07:00
Brad Davis
94cd0762bd Merge pull request #5059 from ctrlaltdavid/20560 
CR for #20560 - Re-style QML Login Window
 2015-06-07 13:19:14 -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
David Rowe
d7866d9981 Rename previous Dialog to VrDialog 2015-06-06 10:48:07 -07:00
David Rowe
bbde367386 Rename new Dialog to DialogContainer 2015-06-06 10:42:49 -07:00
Leonardo Murillo
68b419deec Syncing 2015-06-05 17:11:32 -06:00
David Rowe
7fb434613c Fix #include for Unix 2015-06-05 15:57:09 -07:00
David Rowe
c7c355c19f Remove circular login dialog variation 2015-06-05 15:37:25 -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
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
David Rowe
ee8449712c Code review and tidying 2015-06-05 13:23:06 -07:00
David Rowe
7e9122e3d1 Replace login background SVGs with QML rectangles 2015-06-05 13:15:18 -07:00
David Rowe
f168385798 Add spinner in place of "Logging in..." 2015-06-05 12:57:40 -07:00
ZappoMan
f8a2fff5a7 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:06:10 -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
Seth Alves
edb3622c85 Merge pull request #5037 from AndrewMeadows/inertia 
collision groups for physical objects
 2015-06-05 10:26:28 -07:00
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
David Rowe
562228e924 Change login password recovery link text 2015-06-05 09:47: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
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
David Rowe
37aefe73f8 Remove unnecessary semicolons 2015-06-05 09:07:07 -07:00
David Rowe
426fbc662a White error text instead of black 2015-06-05 09:03:46 -07:00
David Rowe
6c7fb7e54c Fix setting focus at start-up when not logged in 2015-06-05 09:02:35 -07:00
Leonardo Murillo
01236e0159 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-05 09:48:44 -06:00
David Rowe
977eae9f86 Make login password and register links work 2015-06-05 08:42:33 -07:00
David Rowe
ce78a95dee Make login dialog able to be dragged 2015-06-05 08:22:36 -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
David Rowe
0538eb5756 Add remainder of dialog content and polish look 2015-06-04 22:27:23 -07:00
Seth Alves
9a67f35b59 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-04 19:02:46 -07:00
David Rowe
3388406984 Add basic username, password, login, and error functionality and styling 2015-06-04 18:48:21 -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
David Rowe
afc2f374e5 New login dialog background with circular and rectangular variations 
Developer menu item toggles between the two.
 2015-06-04 14:39:28 -07:00
David Rowe
d33a249b3e Refactor common new dialog functionality into new Dialog.qml 2015-06-04 14:39:28 -07:00
David Rowe
2c17274f49 Rename Dialog.qml to DialogOld.qml 2015-06-04 14:39:27 -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
ZappoMan
d2deef97cc Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-04 09:24:37 -07:00
Atlante45
8e21d9c14b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:11:17 +02: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
a4340b17e9 Remove deprecated render stats 2015-06-04 14:47:04 +02: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
ZappoMan
f1f48afd61 more hacking on overlay build busters 2015-06-03 21:17:10 -07:00
ZappoMan
8ec2b55ad8 more hacking on overlay build busters 2015-06-03 21:06:08 -07:00
ZappoMan
b5b37ce2f5 more hacking on overlay build busters 2015-06-03 20:53:56 -07:00
ZappoMan
4438263014 more hacking on overlay build busters 2015-06-03 20:46:59 -07:00
Seth Alves
4414b67837 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-03 20:43:22 -07:00
ZappoMan
6eb9091a01 fix build buster 2015-06-03 20:30:01 -07:00
ZappoMan
bb623eaaed fix build buster 2015-06-03 19:53:21 -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
ZappoMan
49fa407cd5 fix build buster 2015-06-03 17:57:23 -07:00
ZappoMan
7fde574a2a make model overlays acutally use sub mesh payload items 2015-06-03 16:33:58 -07:00
Stephen Birarda
cf67d22ec7 Merge pull request #5036 from venkatn93/master 
Fixed snapshot bug. Snapshots now save and load ok
 2015-06-03 18:57:29 -04: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
92248d23e7 more indentation changes 2015-06-03 14:59:07 -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
Andrew Meadows
ec0b4a956a move collision group consts to shared lib 2015-06-03 14:13:51 -07:00
ZappoMan
6ba8d7e46b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-03 13:00:30 -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
Andrew Meadows
7b6cc59d30 basic support for collision groups 2015-06-03 11:40:48 -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
Atlante45
7654533888 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:51 +02:00
Atlante45
82133f4e7b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:18 +02: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
Ryan Huffman
8864a1f298 Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch 2015-06-03 09:38:17 -07:00
Atlante45
9df1b05184 Introduce outsideEngineDetails 2015-06-03 18:08:43 +02:00
Brad Hefta-Gaub
8b120ea8cd Merge pull request #5029 from huffman/avatar-batches 
Team Teaching - Avatar batches
 2015-06-03 09:06:10 -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
ZappoMan
2a2be789e4 remove direct call to head/face render since it's a payload item 2015-06-02 22:21:17 -07:00
ZappoMan
ff54334fe1 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:53 -07:00
ZappoMan
a7feca0727 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:00 -07:00
Ryan Huffman
847eccca84 Remove gl polygon offset calls 2015-06-02 22:02:50 -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
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
Ryan Huffman
c4dbf6dae8 Update Avatar rendering to use batches 2015-06-02 17:06:41 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -07:00
David Rowe
878227ab8b Increase address bar dialog size 
Including font size, just for this dialog.
 2015-06-02 16:33:09 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
David Rowe
ec1cb72dd5 Rework QML font sizing to be more consistent across platforms 2015-06-02 14:49:33 -07:00
David Rowe
a8a3c677ad Darken address bar hint text so that it's better visible on the DK2 2015-06-02 14:49:32 -07:00
Sam Gateau
3c7eb4de6d merging with upstream 2015-06-02 14:48:53 -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
507158e510 Merge pull request #5021 from Atlante45/lod 
Team Teaching - LOD shouldRender in render engine
 2015-06-02 12:21:25 -07:00
Sam Gateau
901717fb2c trying to fix the issues of model disappearing 2015-06-02 11:52:22 -07:00
ZappoMan
5459b8402c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-02 11:25:23 -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
David Rowe
fb379f6c00 Fix crash when setting avatar body with Preferences dialog closed 2015-06-02 08:37:45 -07:00
Philip Rosedale
90dd730a25 Merge pull request #4940 from ctrlaltdavid/20544 
CR for 20544 - Make eyelids follow iris as head tilts
 2015-06-01 23:36:07 -07: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
David Rowe
7d12482a49 Untabify 2015-06-01 13:54:14 -07:00
David Rowe
9c52c79fe1 Combine icon and input areas into a single SVG 2015-06-01 13:29:36 -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
David Rowe
b166e24ff5 Fix initial fade-in 2015-06-01 11:06:33 -07:00
ZappoMan
1b8572640b more hacking sams tweaks 2015-06-01 09:07:32 -07:00
David Rowe
9a8bb67f37 Tidy address bar dialog code 2015-06-01 09:01:11 -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
David Rowe
05e251eba4 Add icon to address bar dialog 2015-06-01 09:01:10 -07:00
David Rowe
881941b64d Restyle address bar dialog 
Made the dialog a stand-alone QML file that doesn't inherit from other
dialog QML files so that don't need to rework all dialogs right now.
 2015-06-01 09:01:09 -07:00
David Rowe
a43593c3b2 Dialog opacity transition tidying 2015-06-01 09:01:08 -07:00
David Rowe
2a931119bd Replace expand/collapse dialog animation with fade in/out 2015-06-01 09:01:08 -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
Ryan Huffman
b37a023041 Remove all overlays from Scene on desctruction 2015-05-29 14:55:53 -07:00
Ryan Huffman
3f5b115c67 Move _overlays after scene in Application so it destructs first 2015-05-29 14:55:32 -07:00
Ryan Huffman
667dccbb87 Add Item::INVALID_ITEM_ID and use in overlays 2015-05-29 13:43:49 -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
Seth Alves
1a26421414 Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-29 13:04:45 -07:00
Atlante45
d8168811b3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 19:58:22 +02:00
Seth Alves
b0f6826d17 Merge pull request #4995 from birarda/domain-dtls 
speed up initial connection to domains
 2015-05-29 10:50:01 -07: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
b4806f5aac Fix render::PendingChanges using render::Scene::PendingChanges 2015-05-29 09:40:52 -07:00
Ryan Huffman
0e5cf273ab Fix AABox bounds handling in Overlays 2015-05-29 09:40:23 -07:00
Ryan Huffman
b21d0a3a53 Remove Overlays::renderWorld from Application 2015-05-29 09:40:03 -07:00
Ryan Huffman
2222468e89 Remove Overlays::renderWorld 2015-05-29 08:53:40 -07:00
Ryan Huffman
874f722504 Remove unused Avatar::Pointer typedef 2015-05-29 08:51:37 -07:00
Ryan Huffman
1089490658 Move overlay rendering to Scene 2015-05-29 08:51:25 -07:00
Seth Alves
0cf9afd8ec attempt to save _created as an iso date in utc 2015-05-28 21:21:57 -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
Stephen Birarda
5749fefcd5 have show DS connect refresh existing dialog 2015-05-28 17:07:57 -07:00
Stephen Birarda
7f86ca3f10 refresh the network dialog if it is already up 2015-05-28 17:07:20 -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
Andrew Meadows
2a4cd468e4 Merge pull request #4979 from sethalves/polyvox 
initial pass at Polyvox Entity Type
 2015-05-28 10:43:50 -07:00
Seth Alves
065f19d527 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 10:31:44 -07:00
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
Seth Alves
a91a7942a4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 06:59:39 -07:00
Atlante45
10c2f3f561 More TextRenderer work 2015-05-28 14:51:57 +02:00
Brad Davis
e5bec42512 Fix mouse emulation picking and pointer positioning for the hydra 2015-05-27 23:36:00 -07:00
Andrew Meadows
4e073c77b3 Merge pull request #4978 from sethalves/fix-4973 
recreate PR #4973 with some additional changes -- removed const keywo…
 2015-05-27 21:11:28 -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
Brad Hefta-Gaub
bcc24c9762 Merge pull request #4975 from huffman/scene-avatar 
Team Teaching - Move avatar rendering to Scene pipeline
 2015-05-27 17:13:10 -07:00
Brad Hefta-Gaub
5da3a9440e Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples 
[REQUIRES #4962] Remove global collision and update examples
 2015-05-27 16:09:14 -07:00
Stephen Birarda
734798a365 fix move of connection steps to LNL 2015-05-27 15:50:31 -07:00
Ryan Huffman
ea6b620d8a Add declarations for avatar payload functions 2015-05-27 14:53:49 -07:00
Seth Alves
386b3301f4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 14:46:37 -07:00
Seth Alves
bfa0e9c234 recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity 2015-05-27 14:44:23 -07:00
Seth Alves
ba0467aafe Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…" 2015-05-27 14:10:45 -07:00
Seth Alves
7f99f261c2 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 13:59:13 -07:00
Ryan Huffman
c5a3edee09 Fix error with duplicate variable names 2015-05-27 13:13:52 -07:00
Ryan Huffman
00db7fca70 Update avatar rendering to set displayLookAtVectors 2015-05-27 13:11:29 -07:00
Ryan Huffman
825e071ac0 Add overrides to MyAvatar::render* 2015-05-27 13:02:48 -07:00