ZappoMan
e885ac1821
improved performance of ByteCountCoding<> decode
2015-07-08 17:32:51 -07:00
Sam Gateau
4c44eb63da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
2015-07-08 14:25:13 -07:00
Atlante45
ed296850e2
Rename to clear cache and restart
2015-07-08 12:24:45 -07:00
Atlante45
39cb5100a3
Clear cache and restart first draft
2015-07-08 12:23:22 -07:00
Ryan Huffman
0b0446e527
Add handleComainConnectionDeniedPacket to Application
2015-07-08 11:54:22 -07:00
Ryan Huffman
b960d86f80
Remove datagramProcessor from Application
2015-07-08 11:54:06 -07:00
Philip Rosedale
574758eae9
Merge pull request #5252 from ctrlaltdavid/20601
...
DO NOT MERGE - QA for #20601 - Fix and improve eye gaze
2015-07-08 11:37:40 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Stephen Birarda
1f68ad892a
replace PacketList usage with NLPacketList
2015-07-07 16:14:57 -07:00
Stephen Birarda
11d5aa9803
fix queryPacket initialization in Application
2015-07-07 15:41:07 -07:00
Stephen Birarda
56880e8858
return fixes for NAK PacketLists
2015-07-07 15:33:03 -07:00
Stephen Birarda
45b549398d
use PacketList for application nack packets
2015-07-07 15:31:58 -07:00
Stephen Birarda
e05470a11c
change to new packet sending in Application
2015-07-07 11:11:20 -07:00
Stephen Birarda
a9420d4212
replace controlled broadcast to nodes in Application
2015-07-02 17:55:26 -07:00
Stephen Birarda
0d64e82fe2
replace PacketType declarations with PacketType::Value
2015-07-02 16:38:52 -07:00
David Rowe
87ca7626d7
Merge branch 'master' into 20601
2015-07-02 15:45:32 -07:00
David Rowe
9efeda9716
Adjust gaze target for someone looking at me
2015-07-02 15:43:23 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
David Rowe
3a92878544
Reinstate making someone looking at me look at my camera instead of face
2015-07-02 13:47:52 -07:00
Brad Davis
d5fe6f0bdb
Inhibiting log spam unless a menu item is selected
2015-07-02 12:34:32 -07:00
Clément Brisset
b616fff222
Merge pull request #5220 from howard-stearns/avatar-collision-sounds
...
Avatar collision sounds
2015-07-02 10:27:24 -07:00
David Rowe
c20cd40275
Merge branch 'master' into 20601
...
Conflicts:
interface/src/avatar/Head.cpp
2015-07-02 09:51:47 -07:00
Brad Hefta-Gaub
f16b8d5083
Merge pull request #5246 from jherico/inter_idle_timing
...
Instrument the inter-idle time and tweaking the timeout setting
2015-07-02 09:01:44 -07:00
David Rowe
026f6d3690
Add mouth as third gaze target in addition to left and right eyes
2015-07-01 21:22:30 -07:00
David Rowe
4ced0dc6c4
Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw
2015-07-01 20:24:47 -07:00
David Rowe
26cbb14f45
Alternative look-at gaze left/right with face trackers too
...
Instead of looking at one or other eye depending on look direction.
2015-07-01 20:09:36 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Atlante45
ee13407066
Fix smart pointer casts
2015-07-01 19:22:40 -07:00
David Rowe
fada70fe02
Remove redundant code
2015-07-01 18:32:33 -07:00
David Rowe
bc4c635106
Fix gazing at avatar (when no head tracking or HMD)
...
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
2015-07-01 18:31:16 -07:00
Sam Gateau
d019ef4373
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198
Exposing the display Item Status to js to turn it on/off
2015-07-01 17:27:41 -07:00
Brad Davis
88a733181e
Fixing comment to reflect code
2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01
CR comments and fixing the microsecond display
2015-07-01 16:53:12 -07:00
Brad Davis
59027959b8
CR comments and fixing the average calculation
2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29
Merge pull request #5247 from ericrius1/handRender
...
Fixed broken rendering of hydra visualization paraphernalia
2015-07-01 16:21:32 -07:00
Brad Davis
0c88972f09
Instrument the inter-idle time and tweaking the timeout setting
2015-07-01 16:14:17 -07:00
ericrius1
8b00864175
hydra hand spheres and lasers are rendering again
2015-07-01 15:04:19 -07:00
Clément Brisset
eb3bddfe4c
Merge pull request #5209 from ctrlaltdavid/20589
...
QA for #20589 - Vertical field of view preference change should be applied immediately
2015-07-01 13:53:25 -07:00
David Rowe
6a48b56e0f
In mirror mode look directly at the camera in both normal and HMD view
2015-07-01 13:32:50 -07:00
Howard Stearns
af4b804d37
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 12:50:13 -07:00
Seth Alves
97cd5b8b99
Merge pull request #5223 from SamGondelman/cameraMode
...
misc. key binding/camera fixes
2015-06-27 10:55:34 -07:00
Sam Gondelman
2f0fcba1eb
key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode
2015-06-26 17:28:02 -07:00
Howard Stearns
9a04fdf10a
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-26 16:24:27 -07:00
Howard Stearns
98f165f2ae
Avatar collision sounds.
...
collisionsSoundURL can be set in preferences:
Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav .
Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
2015-06-26 16:23:16 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub
63812f28ad
Merge pull request #5206 from SamGondelman/cameraMode
...
fix bug that was preventing camera mode switches
2015-06-25 18:55:13 -07:00
David Rowe
377979e380
Make field of view preference change be applied immediately
2015-06-25 15:41:10 -07:00
Sam Gondelman
56944afd39
avatar doesn't move in independent mode, alphabetized menu options
2015-06-25 12:36:36 -07:00
Brad Hefta-Gaub
77bbb23a1e
Merge pull request #5175 from hyperlogic/ajt/first-person-avatar
...
Render a different model when in first person view.
2015-06-24 18:54:47 -07:00
Anthony J. Thibault
b88d7c2e05
Added FIXME comment to preRender
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Brad Hefta-Gaub
734a11e12a
Merge pull request #5199 from jherico/scale_rez_fix
...
Fixing misplaced UI on scale resolution
2015-06-24 16:10:33 -07:00
Sam Gondelman
19ec080e2b
Merge with master
2015-06-24 15:04:03 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Brad Davis
fb2fb06371
Fixing misplaced UI on scale resolution, PC edition
2015-06-23 15:42:32 -07:00
Sam Gondelman
778e19ac11
fixed camera mode issue
2015-06-23 11:45:08 -07:00
Sam Gondelman
824c219fa0
started fixing camera mode issue
2015-06-23 09:26:38 -07:00
Bradley Austin Davis
f833121032
Fixing the initial missing UI on retina displays, again
2015-06-22 19:55:52 -07:00
Brad Davis
4cd1c52987
Fixing HMD position offset bug in picking & stereo rendering in HMD
2015-06-22 11:20:48 -07:00
Brad Davis
3231bbba5a
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-22 09:44:16 -07:00
bwent
c315bcec24
Expose mouseDoublePressEvents to js
2015-06-19 15:52:27 -07:00
Brad Davis
cc6b589ae5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-19 14:48:38 -07:00
Brad Davis
99c217184b
Fixing the mic/camera buttons and the mirror UI buttons
2015-06-19 14:46:39 -07:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Brad Davis
9bef5f011b
Reverting mirror functionality
2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f
Merge branch 'master' into overlay
2015-06-18 21:56:11 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Brad Hefta-Gaub
a7a53d8be7
Merge pull request #5148 from SamGondelman/rotationModes
...
center player in view mode
2015-06-18 18:02:47 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c
actionEvent signal, captureActions, began work on hmdControls.js
2015-06-18 09:52:36 -07:00
Brad Davis
5c4fa77acd
Merge branch 'temp' into overlay
2015-06-18 00:59:31 -07:00
Brad Davis
a83a4fb0a1
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-17 19:53:31 -07:00
David Rowe
67206332e6
Make individual reload buttons reload scripts
2015-06-17 16:11:30 -07:00
David Rowe
2a00586e21
Fix missing hack
...
Matches hack in stopScript().
2015-06-17 16:11:29 -07:00
David Rowe
17f7d76025
Redownload scripts that are loaded via Script.load() when reloading all
2015-06-17 16:11:28 -07:00
David Rowe
5dab977c28
Add a reload script button after each script in list of running scripts
2015-06-17 16:11:26 -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
8a1b519071
Working on overlays
2015-06-17 16:06:06 -07:00
Brad Davis
ae1c9603b9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:13:04 -07:00
Bradley Austin Davis
11fff7c6e5
debugging stack on OSX
2015-06-17 13:49:42 -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
Andrew Meadows
61f62f96b0
Merge pull request #5129 from SamGondelman/master
...
Integrating gamepads/hydras to input mapping system, zooming
2015-06-17 11:39:38 -07:00
Brad Davis
1e90aaf9c3
Working on overlays still, mirror rendering and overlay order
2015-06-17 11:35:30 -07:00
Brad Davis
5ded9e7eb9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 10:50:01 -07:00
ZappoMan
467609f2b6
standardize skybox and atmosphere batch
2015-06-17 09:44:26 -07:00
ZappoMan
b5731135dd
cleanup
2015-06-17 09:08:41 -07:00
Brad Davis
2bf53b625e
Working on overlays and stats
2015-06-17 02:00:13 -07:00
ZappoMan
006899d73f
more hacking almost working
2015-06-16 22:23:14 -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
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
ZappoMan
167e7d1377
first cut at atmospheres in batch (doesn't work)
2015-06-16 14:05:14 -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
Sam Gondelman
22961fcc9d
added camera mode to keep player in center of view
2015-06-15 15:44:56 -07:00
Leonardo Murillo
c065269ba7
Merging with upstream
2015-06-15 11:58:52 -06:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
Brad Davis
e44b21ee0b
Working on functional overlays
2015-06-13 10:36:52 -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
Sam Gondelman
1a8df6509f
userinputmapper supports hydra, but some hydra events still register as mouse events
2015-06-12 18:22:56 -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
Ryan Huffman
ad77374732
Fix setting of _renderMode
2015-06-12 13:03:33 -07:00
ZappoMan
0cdc2b53fe
Revert "Merge pull request #5106 from jherico/render_cursor"
...
This reverts commit 4d18bd7cec24fda9a733
2015-06-12 12:57:24 -07:00
Sam Gondelman
b4e108cd3b
added zooming to default joystick controls
2015-06-12 10:16:00 -07: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
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
b7cd1ea72a
Merge remote-tracking branch 'upstream/master' into render_cursor
2015-06-11 15:04:56 -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
Seth Alves
4216308b9b
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-10 19:05:25 -07:00
Seth Alves
1c0c7f0fe3
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-10 15:30:28 -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
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
Leonardo Murillo
1d785c714b
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-09 09:01:50 -06: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
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
ZappoMan
24c8e7d0e6
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-08 13:50:50 -07: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
Brad Davis
5faa53d7e9
Working on OVR SDK 0.6
2015-06-08 10:17:34 -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
de268c47b3
Working on 0.6
2015-06-07 18:25:16 -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
Leonardo Murillo
2236ccf0e1
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-05 16:18:03 -06:00
Niraj Venkat
827d8bd854
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-05 13:33:41 -07:00
Niraj Venkat
a3f19e9d4c
Fixing title bar update on teleport
2015-06-05 13:33:14 -07:00
ZappoMan
7ebe64b52f
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 11:01:17 -07:00
Seth Alves
4e10c28b41
merge from upstream
2015-06-05 10:31:13 -07:00
Brad Davis
16f55c7557
Fix the skybox jiggle in the HMD
2015-06-05 09:52:56 -07:00
ZappoMan
807cc3db24
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-05 09:37:39 -07:00
Leonardo Murillo
01236e0159
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-05 09:48:44 -06:00
Sam Gateau
3a93409080
Merging the day after the flight back to france, getting all the fixes
2015-06-04 23:02:05 -07:00
Seth Alves
9a67f35b59
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-04 19:02:46 -07:00
Eric Levin
5e15c14539
added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"
2015-06-04 16:45:32 -07:00
Atlante45
94ba84a84c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
2015-06-04 18:48:15 +02:00
ZappoMan
d2deef97cc
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-04 09:24:37 -07:00
Atlante45
41be3fee87
Merge branch 'fix_world_box' of github.com:Atlante45/hifi into lod
2015-06-04 14:39:32 +02:00
Atlante45
96be60c0cf
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
2015-06-04 14:22:12 +02:00
Atlante45
54b0a03fae
Fix wrong enum used
2015-06-04 13:56:21 +02:00
Atlante45
6dc3bf9285
Fix world box messing up everything
2015-06-04 13:48:39 +02:00
Sam Gateau
329a3b4c7d
force the worldbox to use the simple program which should fix its rendering
2015-06-03 23:29:32 -07:00
Seth Alves
4414b67837
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-03 20:43:22 -07:00
Leonardo Murillo
4f93328759
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-03 19:39:00 -06:00
Leonardo Murillo
b60597aa90
AutoUpdate is now a singleton invoked via Dependency Manager, first steps towards QML update notification
2015-06-03 19:38:54 -06:00
Niraj Venkat
29a15453ac
Visual studio tab issues fixed
2015-06-03 15:35:04 -07:00
Niraj Venkat
4db110a6e1
Final fixes. Snapshot should be good now
2015-06-03 15:09:45 -07:00
Niraj Venkat
694272ffaa
"fixed" formatting issues and code cleanup
2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7
Fixed snapshot bug. Snapshots now save and load ok
2015-06-03 14:29:39 -07:00
Ryan Huffman
d6878c20b5
Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch
2015-06-03 12:03:44 -07:00
Sam Gateau
b339aa683a
adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items
2015-06-03 11:25:45 -07:00
Ryan Huffman
b8f3c42712
Update renderWorldBox to use batches
2015-06-03 09:03:04 -07:00
Atlante45
bbf1837796
Introduced RenderDetails/Stats don't pull details
...
- Regrouped everything stat in a struct
- Details are set into the stats
2015-06-03 16:14:23 +02:00
Seth Alves
a31a5a1554
main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step
2015-06-02 19:40:20 -07:00
Leonardo Murillo
cefdbc3126
Checkpoint auto updater
2015-06-02 19:32:03 -06:00
Sam Gateau
640071dd35
Avoiding any setVIewTransform in payloadREnder and introducing monitoring values
2015-06-02 18:23:53 -07:00
Sam Gateau
903837ab4f
exposing some controls on the engine to js for debugging
2015-06-02 15:57:37 -07:00
Sam Gateau
3c7eb4de6d
merging with upstream
2015-06-02 14:48:53 -07:00
Sam Gateau
901717fb2c
trying to fix the issues of model disappearing
2015-06-02 11:52:22 -07:00
Sam Gateau
ef2d8a0dbe
tuesday morning rendering poor performances networking issue
2015-06-02 10:58:56 -07:00
Atlante45
c012a581a6
Set shouldRender method
2015-06-02 19:26:39 +02:00
Sam Gateau
cd7914ad9d
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-06-01 17:31:39 -07:00
Sam Gateau
bd7c22e715
Trying to transfer the rnedering from displaySide to RenderDeferredTask
2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-01 14:42:35 -07:00
Stephen Birarda
12bcbbf338
Merge pull request #5012 from ctrlaltdavid/20555
...
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
2015-06-01 17:08:00 -04:00
samcake
50f3d2d12b
Merge pull request #5014 from ZappoMan/team-teaching-scene-api
...
TEAM TEACHING - report correct part bounds
2015-06-01 13:55:55 -07:00
ZappoMan
750d9c0616
poor mans version of mesh part bounds
2015-06-01 12:53:09 -07:00
samcake
98c0cd7d23
Merge pull request #5009 from ZappoMan/team-teaching-scene-api
...
TEAM TEACHING - hacking on rendering mesh parts
2015-06-01 12:24:27 -07:00
ZappoMan
4b46fc3ad9
cleanup Model::renderPart()
2015-06-01 11:11:27 -07:00
ZappoMan
1b8572640b
more hacking sams tweaks
2015-06-01 09:07:32 -07:00
David Rowe
e41b4c1b7b
Add new address bar dialog error message
...
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
2015-06-01 09:01:11 -07:00
Sam Gateau
83c4a52454
Cleaning for PR
2015-05-31 19:34:03 -07:00
Sam Gateau
33d397a440
A fist update solution for the item
2015-05-31 19:10:37 -07:00
Sam Gateau
ddec8fd26f
Trying to find a good solution for update message & data
2015-05-30 13:57:05 -07:00
Sam Gondelman
c19115a485
actually fixed billboard
2015-05-29 16:53:01 -07:00
Sam Gondelman
4c83c6918d
fixed avatar billboards not displaying
2015-05-29 16:44:16 -07:00
Sam Gateau
7bde81e95f
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-29 15:50:31 -07:00
Sam Gateau
f04f3bda72
Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme
2015-05-29 15:44:14 -07:00
samcake
f8a90684ce
Merge pull request #5000 from huffman/scene-overlay
...
Team Teaching - Move overlay rendering to Scene pipeline
2015-05-29 15:31:46 -07:00
Sam Gateau
eef8077417
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-29 13:20:43 -07:00
Atlante45
d8168811b3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 19:58:22 +02:00
Howard Stearns
8e245ec4c2
getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step.
...
Otherwise entities never get to see end events.
Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).
2015-05-29 09:59:21 -07:00
Ryan Huffman
b21d0a3a53
Remove Overlays::renderWorld from Application
2015-05-29 09:40:03 -07:00
Sam Gateau
dd9cafcd09
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-28 18:14:41 -07:00
Sam Gateau
3f8bdc14c4
reinserting culling, lod and depth sort to the rendering
2015-05-28 18:01:31 -07:00
Brad Hefta-Gaub
1c3398f27e
Merge pull request #4991 from ZappoMan/team-teaching
...
TEAM TEACHING - merge from master
2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc
Undo the merge with the broken master checking. What could go wrong?
2015-05-28 13:48:27 -07:00
Howard Stearns
810c766f77
When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit.
2015-05-28 12:50:02 -07:00
ZappoMan
1029a8af7c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-28 12:38:16 -07:00
ZappoMan
a0e51469d3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-28 12:36:34 -07:00
ZappoMan
2fba5a0928
more work on simple renderable
2015-05-28 12:19:43 -07:00
ZappoMan
763e6dd97b
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-27 19:58:11 -07:00
Seth Alves
4fa6f388b9
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:20:59 -07:00
Ryan Huffman
c13254a9c4
Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-avatar
...
Conflicts:
interface/src/Application.cpp
2015-05-27 12:44:52 -07:00
Ryan Huffman
f972e84d6c
Move avatar renedering to Scene
2015-05-27 12:40:26 -07:00
Ryan Huffman
389d5556f5
Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer
2015-05-27 12:36:55 -07:00
Howard Stearns
4b4bf9fd90
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-27 09:29:06 -07:00
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -07:00
Sam Gateau
58e3fe695c
Refining once more for sir gcc on Ubuntu
2015-05-27 01:32:40 -07:00
Sam Gateau
a5c5cc9b70
First Item really rendering , for the WorldBox, desigining more of the RenderContext and task interface
2015-05-27 01:15:14 -07:00
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -07:00
ZappoMan
20ceb72d92
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-26 15:01:26 -07:00
Andrew Meadows
16e5710325
Merge pull request #4954 from ZappoMan/entitysmartpointers
...
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
Sam Gateau
e5755f52e5
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-26 13:57:10 -07:00
samcake
84525aabec
Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer
...
TEAM TEACHING BRANCH - Entity Smart Pointers
2015-05-26 13:56:47 -07:00
Howard Stearns
3c718af43f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-26 13:26:02 -07:00
Sam Gateau
ad0b0cfade
FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace
2015-05-26 11:40:35 -07:00
samcake
dd9d758da1
Fixing the compilation issue for real
2015-05-26 10:53:23 -07:00
Sam Gateau
0083ba6f85
trying again
2015-05-25 17:39:31 -07:00
Sam Gateau
ad054a640e
Fixing a problem with Mac/ubuntu build maybe
2015-05-25 17:21:03 -07:00
Howard Stearns
cbf4e09a10
Remove global collision event.
2015-05-25 16:10:50 -07:00
Sam Gateau
f0ab6d96f5
merge with upstream team-teaching
2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee
Insert a first scene and the engine in the Application and render a first Item
2015-05-24 17:03:43 -07:00
ZappoMan
9988f2d1cd
EnitityItem smart pointers
2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Ryan Huffman
47d9cf42c5
Remove unused lodManager
2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f
Update RenderArgs construction in paintGL
2015-05-22 16:02:24 -07:00
Ryan Huffman
d1a5662ca7
Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
Sam Gateau
a28c99bb40
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-22 14:40:00 -07:00
Sam Gateau
e7e3eb2b7c
FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter
2015-05-22 12:58:18 -07:00
Andrew Meadows
461d08c0a9
merge upstream/master into andrew/bispinor
2015-05-22 11:35:02 -07:00
Atlante45
20ff43e29a
Don't sync by default
2015-05-22 20:29:25 +02:00
Ryan Huffman
6fd474a1a3
Fix comment
2015-05-22 09:56:21 -07:00
Ryan Huffman
4a4c9c75fc
Add gpu::context to RenderArgs and start using RenderArgs in place of the flags
2015-05-22 09:50:51 -07:00
Andrew Meadows
01cc629224
fix crashes during init and shutdown
2015-05-22 09:20:08 -07:00
Atlante45
e5aa696dda
syncInputStateCache
2015-05-22 17:39:08 +02:00
Andrew Meadows
67f5d0773d
some list management of AvatarMotionStates
2015-05-21 14:40:47 -07:00
ZappoMan
946878006d
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching
2015-05-20 18:46:32 -07:00
samcake
496898273c
Merge pull request #4846 from jherico/dk1
...
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
2015-05-20 17:02:28 -07:00
