Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 14:36:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39207 commits 25 branches 0 tags 1.1 GiB
Commit graph

14610 commits

Author SHA1 Message Date
samcake
e645f8a1f1 FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore 2016-02-01 16:25:55 -08:00
Brad Davis
1d4dc636af Merge pull request #7002 from hyperlogic/tony/qml-overlay-delete-fix 
QmlOverlay: Fix for issue use after delete
 2016-02-01 16:03:58 -08:00
Brad Davis
3fcea102ed Remove unused variable 2016-02-01 16:03:47 -08:00
Anthony J. Thibault
bea5ced3eb QmlOverlay: remove unnecessary capture by value sigil from lambda 2016-02-01 15:46:49 -08:00
Anthony J. Thibault
db5e750fd7 Removed debug code 2016-02-01 15:45:57 -08:00
Anthony J. Thibault
64b56207f2 QmlOverlay: Fix for issue use after delete 
Sometimes, it was possible to set the qmlElement bounds AFTER the qmlElement itself was deleted on another thread.
To fix this we use a shared_ptr to hold the qmlElement, then use a weak_ptr in the setProperties lambda, to verify that the qmlElement still exists.

The script that was previously causing this code to fail is: "users.js".
Because, it creates a textSizeOverlay then immediately deletes it.
 2016-02-01 14:20:29 -08:00
samcake
1b52d700a0 Merge pull request #6871 from Atlante45/feat/draw-call-info 
Unify normal and named draw paths
 2016-02-01 14:19:15 -08:00
Brad Hefta-Gaub
6779bc4073 Merge pull request #7000 from jherico/qml 
Snapshot UI in QML
 2016-02-01 14:00:25 -08:00
Brad Hefta-Gaub
711787a997 Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal 
Animate iff visible with step2 billboard removal
 2016-02-01 13:54:25 -08:00
Brad Davis
27c38599a9 Snapshot dialogs 2016-02-01 11:07:48 -08:00
Brad Davis
eb7988e4ef Cleaning up unused code 2016-02-01 11:07:46 -08:00
Atlante45
7e8ea4dc77 Update primitive instance rendering calls 2016-02-01 18:50:01 +01:00
howard-stearns
277dbdbc37 Merge branch 'master' of https://github.com/highfidelity/hifi into better-head-joint-setup 2016-02-01 09:35:30 -08:00
Seth Alves
753fc44c12 Merge pull request #6996 from thoys/hydra-scaling-fix 
Fix for controller palm movement for scaled avatars
 2016-02-01 09:17:22 -08:00
Seth Alves
b553c8400d Merge pull request #6988 from huffman/market-import-fail 
Fix marketplace imports failing silently if edit.js not running
 2016-02-01 07:06:34 -08:00
Babiuch, Ryan Nicholas
47f7d55e2c Working energy usage for entity manipulation. 
- Working example in examples/example/ui/MyEnergyBar.js
 2016-02-01 08:32:52 -06:00
Thijs Wenker
8f6e7018bd Fix for Hydra scaling 
This PR fixes the hydra (and probably other hand controllers) while scaling.

Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
 2016-01-31 23:39:43 +01:00
Seefo
07043d537f Fixed Ubuntu warnings 2016-01-29 21:11:44 -05:00
Seefo
0fad9b6755 Changed literals to follow coding standard 2016-01-29 20:07:45 -05:00
Seefo
56c3a37cdd Fixed indentation 2016-01-29 19:59:28 -05:00
Seefo
77050b13dc Adjusted default pitch/yaw speed 2016-01-29 19:41:34 -05:00
Seefo
33a01819e3 Fixed indentation 2016-01-29 19:36:23 -05:00
Seefo
ffa6687af3 Added setting dialogs for camera pitch and yaw 2016-01-29 19:34:57 -05:00
howard-stearns
ceed571c82 Look harder for head, log if not found, and compute what we need 
regardless.
 2016-01-29 16:02:58 -08:00
Seefo
22044db0b1 Readded center avatar in view option now that third person camera is fixed 2016-01-29 18:48:49 -05:00
Ryan Huffman
acf96a401f Fix marketplace imports failing silently if edit.js not running 2016-01-29 15:48:08 -08:00
David Rowe
e07baf916b Fixed a typo noticed in passing 2016-01-30 12:30:21 +13:00
David Rowe
a5bc1cfd19 Periodically store avatar location 2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94 Store avatar location after a teleport 2016-01-30 12:26:50 +13:00
David Rowe
be4022983b Don't store avatar location immediately after a host change 
Because the avatar location is 0,0,0 rather than the end target.
 2016-01-30 12:25:56 +13:00
howard-stearns
9601b65269 Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-29 11:40:13 -08:00
Brad Hefta-Gaub
721a911cf1 Merge pull request #6972 from jherico/qml 
Small QML Fixes
 2016-01-29 09:57:15 -08:00
Brad Hefta-Gaub
8efe15cb21 Merge pull request #6963 from jherico/qmlOverlays 
Make all 2D overlays QML-based
 2016-01-28 23:33:30 -08:00
Brad Davis
5b1971907c Move bookmarks to QML only dialogs 2016-01-28 21:20:43 -08:00
Brad Davis
5b2e739ef3 Fixing warning 2016-01-28 16:39:40 -08:00
Brad Davis
06071c6493 Fixing build errors 2016-01-28 16:03:26 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
Brad Davis
aa03241dd9 Make all load script dialogs QML and respect previous script location 2016-01-28 15:53:04 -08:00
David Rowe
2020514974 Move OpenGLVersionChecker to gl library 2016-01-29 12:29:21 +13:00
David Rowe
b7134c75c3 Rename OpenGLInfo to OpenGLVersionChecker 2016-01-29 12:14:47 +13:00
David Rowe
af3d842e60 Warn user if OpenGL version is too low (< 4.1) 2016-01-28 15:25:00 +13:00
howard-stearns
1225e50581 One round of billboard shredding. Server/wire/AvatarData have not been 
touched.
 2016-01-27 16:15:43 -08:00
Andrew Meadows
7b5c221ceb Merge pull request #6956 from hyperlogic/tony/velocity-fix 
MyAvatar: copy body velocity + hmd follow velocity onto avatar
 2016-01-27 14:59:46 -08:00
samcake
f4e0352f61 Merge pull request #6930 from zzmp/feat/bubble-render-settings 
Bubble up render settings from CPP to JS/QML
 2016-01-27 14:20:51 -08:00
howard-stearns
fa40e347ee Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-27 13:35:02 -08:00
James B. Pollack
86b2a67f72 Merge pull request #6891 from sethalves/avatar-updates-query-cube 
Avatar updates query cube
 2016-01-27 13:04:03 -08:00
Anthony J. Thibault
c771c925c8 MyAvatar: copy body velocity + hmd follow velocity onto avatar 
This was inadvertently removed in a previous PR.

https://github.com/highfidelity/hifi/pull/6895

Also, renamed Velocity stat to Speed.
 2016-01-27 11:20:32 -08:00
Howard Stearns
0d257b82fa Merge pull request #6934 from hyperlogic/tony/anim-pre-post-rot-support 
Avatar Developer Menu: added animation debug options
 2016-01-27 10:39:25 -08:00
Brad Davis
f53aaa1d64 Removing old attachment dialog, updating menu code 2016-01-26 21:55:42 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Zach Pomerantz
e770d7b679 Add PhysicsShowOwned back to Menu 2016-01-26 18:56:52 -08:00
Zach Pomerantz
5009e8702e Cleanup new render settings 2016-01-26 15:58:50 -08:00
Seth Alves
1cc0aa18bb Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube 2016-01-26 13:31:07 -08:00
Seth Alves
1fefe0fa0e when an avatar moves a child entity around, it has to invoke MovingEntitiesOperator to keep the local octree up-to-date 2016-01-26 13:30:55 -08:00
howard-stearns
e145cf60be cleanup init 2016-01-26 13:01:29 -08:00
Zach Pomerantz
2da2bc60db Tie shadow frustum to boom offset 2016-01-26 12:26:16 -08:00
howard-stearns
2e7f1cbb3f Align avatar animation with LOD visibility. 2016-01-26 11:59:18 -08:00
Anthony J. Thibault
3cee3cbb5a Avatar Developer Menu: added animation debug options 
This options are for for developers only and might help debug animation related issues.

* Enable Inverse Kinematics: this can be toggled to disable IK for the avatar.
* Enable Anim Pre and Post Rotations: this option can be used to use FBX pre-rotations from source avatar animations, instead of the current default, which is to use them from the source model.
  This only effects FBX files loaded by the animation system, it does not affect changing model orientations via JavaScript.
 2016-01-25 18:52:13 -08:00
Zach Pomerantz
bed325d675 Add Graphics to general settings 2016-01-25 15:17:43 -08:00
howard-stearns
cd44094efa When user is asked about disk cache, allow them to say no. 2016-01-25 14:46:11 -08:00
howard-stearns
6928984448 remaining Application message boxes, EXCEPT asset upload, which has a 
checkbox.
 2016-01-25 14:45:26 -08:00
howard-stearns
eb19f293c4 Fix askToSetAvatarUrl dialogs to use new style. 2016-01-25 14:04:06 -08:00
Zach Pomerantz
29f9d15af0 Remove render engine items from developer menu 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f3265db298 Gut RenderContext 2016-01-25 12:14:58 -08:00
Zach Pomerantz
f5a408d82a Notes for later 2016-01-25 12:14:58 -08:00
Zach Pomerantz
9064438bf0 Replace RenderScriptingInterface with dynamic Task::Config 2016-01-25 12:13:55 -08:00
Zach Pomerantz
2e1fbf66ad Refine Configuration for render::Job 
wip

wip

wip

wip
 2016-01-25 12:13:55 -08:00
Zach Pomerantz
8b68d5922c Make Engine a Task 2016-01-25 12:13:55 -08:00
Brad Davis
bbefafcb07 Break up preferences dialogs 2016-01-23 23:11:41 -08:00
Brad Davis
3a0f6993c7 Put QML in front of 2D overlays 2016-01-23 22:07:01 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
27fdb523cb Add directory & avatar browsing preferences 2016-01-22 17:30:10 -08:00
Brad Davis
2026821d9e Moving preferences to dependency mananger 2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506 First pass on preferences dialog 
Conflicts:
	tests/ui/qmlscratch.pro
 2016-01-22 17:30:07 -08:00
Brad Hefta-Gaub
0c64d45c18 Merge pull request #6909 from hyperlogic/tony/fly 
MyAvatar: fly animation
 2016-01-22 17:04:53 -08:00
samcake
338342cdec Merge pull request #6859 from zzmp/flag/shadows 
Add shadows behind a render-menu flag
 2016-01-22 16:28:17 -08:00
Andrew Meadows
86162094c1 Merge pull request #6895 from hyperlogic/tony/hmd-recenter-on-rotation 
MyAvatar: Recenter when the head turns away from the hips
 2016-01-22 14:07:40 -08:00
Andrew Meadows
200676ac68 Merge pull request #6896 from AndrewMeadows/another-crash-fix 
fix crash when deleting entities quickly
 2016-01-22 14:04:46 -08:00
Anthony J. Thibault
7af20e90c8 Hooked up fly animation to json and Rig 2016-01-22 13:47:09 -08:00
Anthony J. Thibault
8bfa80d5fc Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation 2016-01-22 13:37:43 -08:00
Anthony J. Thibault
61b760038a Address feedback from code review 2016-01-22 11:54:28 -08:00
Seth Alves
b6af8ee0cc Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube 2016-01-22 11:46:17 -08:00
Seth Alves
7a3401a8d7 Merge pull request #6867 from AndrewMeadows/collision-group-prep 
cleanup in preparation for smarter collision grouping
 2016-01-22 11:45:42 -08:00
Andrew Meadows
d8fb61e820 fix crash when deleting entities quickly 2016-01-22 10:25:10 -08:00
Zach Pomerantz
dee8e0ba9d Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:03:06 -08:00
Brad Hefta-Gaub
e1c369dc10 Merge pull request #6766 from samcake/hdr 
Ambient Occlusion
 2016-01-21 18:10:52 -08:00
Brad Hefta-Gaub
7bfe2730e8 Merge pull request #6849 from jherico/atmosphere 
Remove old atmosphere rendering
 2016-01-21 17:58:59 -08:00
Anthony J. Thibault
a91c181a89 MyAvatar: Recenter when the head turns away from the hips 
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.

Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed.  The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix.  This centralizes the moving/homing code to one place, the CharacterContoller.

A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure.  This "hopefully" makes it easier to maintain.
 2016-01-21 16:38:42 -08:00
samcake
2471a88e85 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 15:53:25 -08:00
Seth Alves
2e1727610e MyAvatar updates the entity-server about queryAACubes of children entities 2016-01-21 15:52:59 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8 Fix wifi ping spikes 
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
 2016-01-21 15:05:32 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Stephen Birarda
b1c151b165 remove dead code in main.cpp 2016-01-21 11:04:39 -08:00
Andrew Meadows
58a7528b68 Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js 
Access avatar parent information from js
 2016-01-21 09:19:40 -08:00
David Rowe
d7d4961778 Wire up missing GlobalServices.connected() signal 2016-01-21 20:58:14 +13:00
Brad Hefta-Gaub
7919d7bc17 Merge pull request #6866 from jherico/menufix 
Fixing overlay menu popup & some more QML cleanup
 2016-01-20 16:58:21 -08:00
samcake
4e5869b247 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 16:30:24 -08:00
Zach Pomerantz
0c798c06a9 Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-20 14:51:42 -08:00
samcake
0da4df93b8 Merge pull request #6860 from zzmp/refactor/cull-functor 
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
 2016-01-20 14:25:42 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
samcake
320c799379 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 10:14:02 -08:00
Brad Davis
d97f930dc9 Prevent update dialog from becoming locked 2016-01-19 22:33:00 -08:00
Andrew Meadows
a92c512c17 move collision group/mask calculus into EntityItem 2016-01-19 19:52:08 -08:00
Howard Stearns
730640068c Merge pull request #6865 from ZappoMan/fixPrematureQuery 
fix premature octree query before preferences are loaded
 2016-01-19 19:32:34 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Seth Alves
09dd3e2a56 merge from upstream, respond to code review 2016-01-19 14:38:22 -08:00
Brad Hefta-Gaub
bcdff7ba4a fix premature octree query before preferences are loaded 2016-01-19 13:11:11 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
Andrew Meadows
feb2a82d93 Merge pull request #6856 from hyperlogic/tony/hand-grab-one-frame-lag-fix 
Avatar: Fix for one frame lag in hold action
 2016-01-19 11:43:27 -08:00
Zach Pomerantz
568ae2e7bc Move ShoudRenderFunctor to render::CullFunctor 2016-01-19 11:24:11 -08:00
Anthony J. Thibault
b750128c94 Avatar: centeralized palm rotation/position to world space calculation. 2016-01-19 11:03:00 -08:00
Brad Hefta-Gaub
fca5b29e6f Merge pull request #6786 from AlessandroSigna/overlays 
Thread-safe access to EntityTree in OverlayPanel
 2016-01-19 09:02:45 -08:00
Anthony J. Thibault
ec2f8db83a Avatar: Fix for one frame lag in hold action 
AvatarActionHold now uses the most recent un-cached palm positions/orientations
instead of the cached version from the previous frame.
 2016-01-18 17:37:28 -08:00
Zach Pomerantz
1b36d56b7a Add shadowmap as a debug feature 2016-01-18 17:12:42 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
29945bba92 Merge pull request #6837 from zzmp/feat/render-shadow 
Add RenderShadowTask
 2016-01-18 15:45:51 -08:00
Howard Stearns
6f84a67453 Merge pull request #6840 from jherico/qml_cleanup 
File dialogs and modal message boxes in QML
 2016-01-18 15:04:37 -08:00
Seth Alves
af10fd3b36 Merge branch 'master' of github.com:highfidelity/hifi into access-avatar-parent-id-from-js 2016-01-18 14:39:15 -08:00
Howard Stearns
5caf10beed Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck 
Include checking the angular size of entities on the server side for LOD support
 2016-01-18 14:13:34 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Seth Alves
41c46423ba add support for avatar set/get parent Joint Index, as well 2016-01-18 13:09:09 -08:00
Seth Alves
5ee1acc1ea expose avatar getParentID and setParentID to javascript 2016-01-18 12:45:12 -08:00
Brad Hefta-Gaub
d10e1cc39d CR feedback, dead code cleanup 2016-01-18 12:09:21 -08:00
Brad Hefta-Gaub
88af387214 cleanup 2016-01-18 10:10:24 -08:00
Brad Hefta-Gaub
2774df38bc check for entity size before including it for LOD 2016-01-18 09:06:57 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Stephen Birarda
275fa1c5c7 fix for override warnings with clang on OS X 2016-01-15 15:41:34 -08:00
Andrew Meadows
8b420adbc8 namechange MotionType to PhysicsMotionType 2016-01-15 15:21:25 -08:00
samcake
2494623bc7 Cleaning the code for review 2016-01-15 10:55:43 -08:00
Ryan Huffman
0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging 2016-01-15 10:46:22 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window 
Tool window in QML
 2016-01-14 16:56:27 -08:00
Brad Hefta-Gaub
0ad39feeb6 juggle developer menus a bit 2016-01-14 13:31:01 -08:00
Brad Hefta-Gaub
2177765b09 wire up audio show level meter menu 2016-01-14 13:12:16 -08:00
Ryan Huffman
fe4c161cb6 Fix sending URL to second interface instance 2016-01-14 12:47:36 -08:00
Ryan Huffman
196161fe93 Merge pull request #66 from birarda/console-dev 
some initial packaging work and console fixes
 2016-01-14 10:17:24 -08:00
Brad Davis
d924e042bc Merge pull request #6834 from ZappoMan/hmdFixes 
fix issues with HMD lookout 2D, and cleanup
 2016-01-14 12:42:23 -05:00
Brad Hefta-Gaub
6b76cf484d fix issues with HMD lookout 2D, and cleanup 2016-01-14 08:48:55 -08:00
Andrew Meadows
82e261480f Merge pull request #6827 from howard-stearns/physics-timing 
Physics timing
 2016-01-14 08:39:29 -08:00
Brad Hefta-Gaub
8f8afabbfe Merge pull request #6811 from Atlante45/master 
Fix skybox not always rendering correctly
 2016-01-13 21:00:48 -08:00
Zach Pomerantz
2938829167 Add shadow items to stats 2016-01-13 17:49:37 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
howard-stearns
830dcb582a Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing 2016-01-13 13:32:38 -08:00
howard-stearns
8a77e2ee95 Split physics perf timing into three parts: updateStates, stepSimulation, 
and harvestChanges.
 2016-01-13 13:31:37 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00