Sam Gondelman
b4e108cd3b
added zooming to default joystick controls
2015-06-12 10:16:00 -07:00
Atlante45
228f8c2e61
Fix a few items rendering without pipeline
2015-06-12 17:34:16 +02:00
Howard Stearns
27f40ea881
Signal Audio.disconnected, and use new hello/goodbye sounds in resources.
2015-06-11 20:33:30 -07:00
Sam Gondelman
72cc070f0a
enabled remappable zooming (with keyboard: shift + w, shift + s, and others), switches to first person if you zoom in a lot
2015-06-11 18:24:32 -07:00
Brad Davis
09cfe004a1
Combining with new cursor render code
2015-06-11 16:55:23 -07:00
Sam Gondelman
2bdef6205e
added more available inputs to joystick and keyboardmousedevice
2015-06-11 16:20:46 -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
Sam Gondelman
b8b61e7c62
integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js
2015-06-11 15:51:21 -07:00
Brad Davis
92f22bc6d5
Magic number and build errors
2015-06-11 15:40:16 -07:00
Brad Davis
d3cdbc389a
Code cleanup
2015-06-11 15:05:08 -07:00
Brad Davis
b7cd1ea72a
Merge remote-tracking branch 'upstream/master' into render_cursor
2015-06-11 15:04:56 -07:00
Brad Davis
bc206633f5
Fixing overlay rendering in HMD
2015-06-11 14:56:21 -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
Sam Gondelman
0e8ec81837
fixed lambda capture
2015-06-11 09:41:59 -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
Brad Davis
ef52035300
Working on functional overlays
2015-06-11 02:20:51 -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
Brad Davis
ac0fc5d974
Working on oculus overlay code
2015-06-11 00:57:58 -07:00
Philip Rosedale
b32994b359
Merge pull request #5083 from ctrlaltdavid/20551
...
CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace
2015-06-10 22:32:25 -07:00
Seth Alves
4216308b9b
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-10 19:05:25 -07:00
Seth Alves
eccf4eb8a8
hold action works
2015-06-10 17:05:49 -07:00
ZappoMan
139855f487
handle remove attachment case
2015-06-10 16:13:17 -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
Sam Gateau
1f62fb4b6f
Adding standard vertex and pixel shaders for drawing texture in applicationOverlay
2015-06-10 15:24:29 -07:00
Bradley Austin Davis
1dfc9c89eb
Fix doubled cursor on OSX
2015-06-10 13:57:48 -07:00
Leonardo Murillo
3bd0c7bd87
Code Review changes
2015-06-10 14:35:52 -06:00
Brad Davis
ca1af77763
Working on cursor manager
2015-06-10 13:24:56 -07:00
Leonardo Murillo
869461a01b
Code Review changes
2015-06-10 14:14:00 -06: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
Brad Davis
7374fb84e8
Working on fixing overlays with team-teaching merge
2015-06-10 09:36:14 -07:00
ZappoMan
aa05d9f67c
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments
2015-06-10 08:53:33 -07:00
Atlante45
8570fe0c19
Shared ptr tweaks
2015-06-10 15:02:26 +02:00
Atlante45
3af8bec3d7
Fix ghost avatars/displaynames
2015-06-10 14:59:27 +02:00
ZappoMan
dbae2c34ba
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments
2015-06-09 21:55:25 -07:00
ZappoMan
e0adb8e38a
render avatar attachments as model payload items
2015-06-09 12:57:04 -07:00
David Rowe
01b1e9c4ed
Signal domain changes for those handled by ICE as well as not
2015-06-09 12:33:14 -07:00
Brad Hefta-Gaub
fb4e5a70bd
Merge pull request #5077 from jherico/render_cursor
...
Always use GL rendered cursor & fix broken cursor after merge
2015-06-09 12:09:24 -07:00
Brad Davis
78ab6a03af
Fixing broken cursor rendering from team-teaching merge
2015-06-09 11:47:19 -07:00
Brad Davis
e5a9fa8cdc
Fixing broken declarations
2015-06-09 11:20:23 -07:00
Brad Davis
78c3ba0e2c
Removing dead code
2015-06-09 10:25:21 -07:00
Brad Davis
64bb120712
Be a little less heavy handed with the GPU sync
2015-06-09 10:25:05 -07:00
Sam Gondelman
0769593ca8
added getters/setters for Inputs and InputChannels
2015-06-09 10:20:36 -07:00
Sam Gondelman
d3a4eec5c5
removed dead code, magic numbers
2015-06-09 09:56:40 -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 Davis
5680d58a19
Removing oglplus requirement for linux and mac
2015-06-09 03:09:10 -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
Seth Alves
983ae5b2f0
quiet compiler, fix some whitespace
2015-06-08 21:19:37 -07:00
Brad Davis
c360dde71a
Merge branch 'master' into render_cursor
...
Conflicts:
interface/src/Application.cpp
2015-06-08 20:18:32 -07:00
ZappoMan
1dca379e1a
dead code removal machine
2015-06-08 15:06:44 -07:00
ZappoMan
b50b7dd500
CR feedback
2015-06-08 14:36:31 -07:00
ZappoMan
8fa31ec521
dead code removal machine
2015-06-08 14:30:31 -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
Leonardo Murillo
edce36f5a1
Checkpoint - buttons in place
2015-06-08 14:29:10 -06:00
Leonardo Murillo
bd85ce1312
Auto Update checkpoint - dialog is QML and populated with real data
2015-06-08 13:55:28 -06:00
ZappoMan
5d6112d9c5
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-08 12:29:32 -07:00
Brad Davis
b3534210e4
Always use GL rendered cursor
2015-06-08 11:51:35 -07:00
Stephen Birarda
666830c04d
add a sound once first AM packet received
2015-06-08 11:30:12 -07:00
Leonardo Murillo
83b7054138
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-08 11:55:47 -06:00
Atlante45
36dfec7827
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching
2015-06-08 19:20:33 +02:00
Brad Davis
5faa53d7e9
Working on OVR SDK 0.6
2015-06-08 10:17:34 -07:00
Atlante45
141d8fa055
Use setUniformTexture
2015-06-08 18:55:13 +02:00
Atlante45
31e565868d
Bind simple textured program
2015-06-08 17:15:50 +02:00
Atlante45
8eeb5e435c
Enable/Disable texture for avatar billboards
2015-06-08 17:13:37 +02:00
Atlante45
d3eaa4755c
Partial fix to billboards
2015-06-08 16:43:38 +02:00
Atlante45
34bdcebbf6
More display name work
2015-06-08 16:28:15 +02:00
Atlante45
2bee021a66
Fix Avatar display names
2015-06-08 15:26:17 +02: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
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
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
162395e7fe
Make login password and register links work
2015-06-07 13:56:56 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
David Rowe
a2272d3f42
Fix Windows C4351 build warning
...
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
2015-05-27 11:49:00 -07:00
Eric Levin
eb0f35e041
removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 11:44:37 -07:00
ZappoMan
4654ed95ac
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-27 10:40:24 -07:00
ZappoMan
2516066e1d
some hacking
2015-05-27 10:40:07 -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
Stephen Birarda
9cb6ccaa46
thread safe timing of domain connection
2015-05-26 16:49:18 -07:00
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
Stephen Birarda
08affbfd0d
fix table size calculations
2015-05-26 16:14:12 -07:00
Stephen Birarda
5b5518077d
fix headers and stats for domain connection timing
2015-05-26 15:51:00 -07:00
