Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 14:08:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71122 commits 25 branches 0 tags 1.1 GiB
Commit graph

7487 commits

Author SHA1 Message Date
unknown
8a22d0adc7 set grabbable user data in addAssetToWorldCheckModelSize 2018-08-11 11:04:44 -07:00
Dante Ruiz
75cc1c62c0 mostly done interstitial page 2018-08-10 16:53:34 -07:00
Simon Walton
3c665b7de8 Don't delete sequence numbers outside of range as range may change 2018-08-10 14:40:08 -07:00
unknown
8c185aa04e fix menu option 2018-08-10 12:13:09 -07:00
unknown
45b9871fdb when adding asset to world set grabbable 2018-08-10 12:10:49 -07:00
unknown
5641c59f5f Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 09:49:37 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Simon Walton
875407b3fe New approach to physics readiness - now (mostly) working 2018-08-09 16:24:04 -07:00
John Conklin II
59977fe1d3
Merge pull request #13764 from r3tk0n/17249-safe-landing 
Relocate Avatar Spawn Point from the Hips to the Feet
 2018-08-09 12:45:30 -07:00
Simon Walton
4395e1fa26 Safe Landing checkpoint 2018-08-09 11:11:58 -07:00
Dante Ruiz
faa5411757 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-09 08:42:14 -07:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -07:00
Simon Walton
88bd4e3d9a WIP - safe landing infrastructure 2018-08-08 12:32:45 -07:00
Dante Ruiz
a9fd034f09 switching to location api 2018-08-07 16:02:54 -07:00
David Back
a905a76c70 reload script cache with reload content 2018-08-07 11:53:11 -07:00
Dante Ruiz
6a4a56cee3 imporving the interstitial page script 2018-08-06 17:42:21 -07:00
MuteTab
de5c7f6dcd Change lambda for address manager position getter. 2018-08-06 16:02:00 -07:00
Sam Gondelman
7dd80d0180
Merge pull request #13240 from jherico/feature/glsl_layouts 
Update shader pipeline, improve mac startup time
 2018-08-06 15:30:46 -07:00
SamGondelman
e3756a6dae Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy 2018-08-06 11:21:51 -07:00
SamGondelman
9806bce403 weak pointers to nodeList 2018-08-06 11:21:32 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
Dante Ruiz
cca76f7022 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-06 08:02:03 -07:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
sabrina-shanman
a460cfac29 Do not store physics engine pointer in PickScriptingInterface 2018-08-03 17:55:54 -07:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a 
Don't allow Web surfaces created by non-client scripts to access files
 2018-08-03 15:25:41 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
d6bcdcde3f Fix DISABLE_QML behavior 2018-08-03 14:58:11 -07:00
Dante Ruiz
2377626203 exposing physics progress 2018-08-03 10:47:58 -07:00
Dante Ruiz
683b42e35b Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-03 09:59:35 -07:00
Dante Ruiz
b9cfbfb3be adding interstitial page file to default sctipts 2018-08-03 09:59:21 -07:00
Alexander Ivash
5a2506e94f FB16831 qml-related warnings in log 
fix is based on exposing C++ objects to QML before root object is created (as root object might already require C++ objects)
 2018-08-03 17:10:41 +03:00
Brad Davis
3c7f1a0c4b Merge remote-tracking branch 'upstream/master' into destroy 2018-08-02 15:34:19 -07:00
Dante Ruiz
048196ec6f disble sending avatar and audio packets during interstitial mode 2018-08-02 11:39:06 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
SamGondelman
1ba28de5b6 try to fix nodelist not getting destroyed 2018-08-01 17:52:27 -07:00
SamGondelman
8a9c27ed92 Merge remote-tracking branch 'upstream/master' into destroy 2018-08-01 16:07:48 -07:00
Brad Davis
4b317a84d8 Don't allow Web surfaces created by non-client scripts to access files 2018-08-01 15:12:45 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244 
Move scriptable caches' APIs into scripting interfaces
 2018-08-01 11:50:13 -07:00
John Conklin II
fcf32dbc6b
Merge pull request #13642 from ctrlaltdavid/M13352 
Fix HMD.mountedChanged() API signal
 2018-08-01 11:28:11 -07:00
Dante Ruiz
0b7d6cb720 start interstitial page work 2018-07-31 14:10:19 -07:00
Simon Walton
a320308eaf Fix sequence number encoding issue 
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
 2018-07-31 13:54:22 -07:00
Simon Walton
8c512ec19b Send spherical view from Interface rather than creating in ES 2018-07-30 18:03:45 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Simon Walton
be1bbc07c2 Don't wait for (nonexistant) ES when in serverless mode 2018-07-30 10:20:55 -07:00
Simon Walton
2ac6ca3291 Remove old physics-enabling code 2018-07-27 17:32:35 -07:00
John Conklin II
9770331259
Merge pull request #13687 from danteruiz/fix-script-memory-issue 
Fix ScriptEngine begin held onto after script stopped runnning
 2018-07-27 12:31:31 -07:00
Simon Walton
3d390203e2 More fixes for clang & gcc 
C++14 issues, I think.
 2018-07-27 11:34:08 -07:00
Seth Alves
41af82a7f6
Merge pull request #13702 from r3tk0n/17016-flying-settings 
17016 flying settings
 2018-07-27 10:07:13 -07:00
Sam Gondelman
3284f7b9d6
Merge pull request #13654 from huffman/fix/mirror-mode-create 
Fix computePickRay when in mirror mode
 2018-07-27 09:05:58 -07:00
Simon Walton
0cec9a72d6 Implement client-side enable physics once indicated EntityData has arrived 
Also now use Entity Server Protocol sequence numbers.
 2018-07-26 18:10:38 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
David Rowe
baf88ab508 Revise scriptable resource caches' interfaces 2018-07-26 16:12:16 +12:00
Simon Walton
a15e78a0f4 Missed an identifier change 2018-07-25 17:36:53 -07:00
David Rowe
16e06de9cd Move scriptable caches into scripting interfaces 
Removed non-working getResource() API functions.
 2018-07-25 22:10:14 +12:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan 
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
 2018-07-24 16:50:37 -07:00
Dante Ruiz
b750a005cf fix script memory issue 2018-07-24 16:31:12 -07:00
sabrina-shanman
5ec277e458 Move bullet references in collision pick API to PhysicsEngine 2018-07-24 15:47:49 -07:00
John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper 
Added _aboutToQuit guard on eventFilter()
 2018-07-24 11:37:19 -07:00
MuteTab
52e5bdb360 Added _aboutToQuit guard on eventFilter() 2018-07-23 14:27:38 -07:00
r3tk0n
bc91affa70 Bring this PR inline with RC70.1 PR. 2018-07-20 15:13:44 -07:00
Ryan Huffman
1f259d235d Fix computePickRay when in mirror mode 
In mirror mode the view frustum is unaffected - instead we flip the
final image. To compensate for this, we need to flip the x coordinate of
our pick point when picking in mirror mode.
 2018-07-19 15:30:11 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
David Rowe
a3e677e64f Code review 2018-07-20 08:32:21 +12:00
MuteTab
63089df2dd Re-added missing semi-colon. 2018-07-19 12:42:45 -07:00
MuteTab
a99f9310da Add first-run checks for flying settings. 2018-07-19 12:41:24 -07:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
David Rowe
5e624246a8 Fix HMD.mountedChanged() API signal 2018-07-19 13:00:57 +12:00
SamGondelman
845ddda695 parabola-overlay and -avatar intersection, handle case where acceleration == 0 2018-07-17 12:41:03 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg 
Android - Prevent pending downloads to happen when going back to home
 2018-07-12 15:22:56 -07:00
John Conklin II
b59e9f9899
Merge pull request #13582 from Zvork/scale 
Render Scale Resolution applied only to 3D rendering not HUD
 2018-07-12 10:56:03 -07:00
John Conklin II
7ea46e26cf
Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539 
MS9539: Update Controls Reference pages
 2018-07-12 10:53:00 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac 
Add Crashpad to Mac
 2018-07-11 19:16:24 -07:00
Wayne Chen
179ba6506e Adding check for WindowsMR to the showHelp menu 2018-07-11 11:56:14 -07:00
Olivier Prat
703fc20856 Separate scale between 3D rendering and HUD 2018-07-11 12:17:36 +02:00
Olivier Prat
9f4fd47b85 Not using render resolution scale in application and display plugin 2018-07-11 10:11:49 +02:00
Wayne Chen
81aac274ed Updating controls reference page 2018-07-10 17:34:03 -07:00
SamGondelman
d2699e8e5b some more attempted cleanup 2018-07-10 10:50:01 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
John Conklin II
e6801c303a
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request 
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
 2018-07-09 10:07:19 -07:00
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
Clement
23e5dd0d2c annotate with fingerprint immidiately 2018-07-06 15:52:30 -07:00
John Conklin II
01610a1520
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444 
Fix AddressManager copyAddress/copyPath functionality
 2018-07-06 14:11:08 -07:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android 
Support web3d overlays in android
 2018-07-06 13:02:56 -07:00
Wayne Chen
eb4704620c reverting unintended line from previous debug 2018-07-06 11:06:16 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00
Alexander Ivash
929fec731c remove 'Avatar' top level menu & 'Avatar...' item in settings menu per request from Mukul 2018-07-06 21:00:54 +03:00
John Conklin II
7aaf17a3c8
Merge pull request #13496 from thoys/feat/interactive-window 
InteractiveWindow scripting API
 2018-07-06 10:58:12 -07:00
Thijs Wenker
1b63dfa20a - OSX fixes (right camera after coming from native window, disappearing content) 
- Fix show() to show the window after it was minimized
 2018-07-06 17:50:48 +02:00
Wayne Chen
3994ec4176 adding potential fix - moving methods to Application 2018-07-05 17:54:27 -07:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
John Conklin II
65daee2353
Merge pull request #13513 from vladest/double_asset_server_fix 
Tablet Asset Server dialog was instantiated twice
 2018-07-03 13:14:12 -07:00
Thijs Wenker
d886bc2d9c Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window 2018-07-03 18:19:48 +02:00
Sam Gateau
96b26c94eb Really add safe check for targetDisplayPLugin 2018-07-03 16:59:40 +02:00
Thijs Wenker
7390983721 introduce scriptable presentationMode instead of automatic mode switching windows 2018-07-03 16:49:49 +02:00
Cristian Duarte
6b5e5702dd Android - implement pause-resume of requests chain in ResourceCache 2018-07-02 20:05:59 -03:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit 
Fix Mac Crashes On Shutdown
 2018-07-02 15:27:26 -07:00
Cristian Duarte
6b3a9def7a Merge branch 'hifi_master' into android_stop_downloads_bg 2018-07-02 17:37:40 -03:00
vladest
0657992e9c Tablet Asset Server dialog was instantiated twice 2018-07-01 19:56:51 +02:00
Gabriel Calero
762e8f4bf0 Refactor WebViewActivity using fragment. Try SlidingDrawer. 2018-06-29 20:43:58 -03:00
sabrina-shanman
9dc03f5013 Destroy GeometryCache explicitly in Application destructor 2018-06-29 10:39:16 -07:00