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

27177 commits

Author SHA1 Message Date
Sam Gondelman
e46a8f022c
Merge pull request #12695 from gcalero/fix/current_context 
Fix/current context
 2018-03-22 10:54:34 -07:00
Gabriel Calero
12b289bbc1 Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread 2018-03-22 12:38:56 -03:00
Brad Davis
d529d7b1d3 Remove whitespace before shader version line 2018-03-21 16:07:04 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex 
Materials on primitives
 2018-03-21 12:08:24 -07:00
John Conklin II
283aff71ec
Merge pull request #12612 from jherico/gl_common 
Break out common GL and GLES code into a single shared library
 2018-03-21 11:28:24 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776 
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
 2018-03-21 09:27:51 -07:00
Bradley Austin Davis
d5d8e4c0b0 Restoring geometry shader 2018-03-20 18:28:53 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix 
Model behaves correctly if missing material
 2018-03-20 14:27:21 -07:00
Sam Gateau
e59eed64fb
Merge pull request #12680 from SamGondelman/relative 
Support relative paths for material images
 2018-03-20 14:24:50 -07:00
Bradley Austin Davis
a861be112f Fix GLES build 2018-03-20 14:15:38 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe 
switch back to app-local VC runtimes and UCRT
 2018-03-20 14:07:27 -07:00
John Conklin II
de5ff20968
Merge pull request #12664 from gcalero/android_websurface_check_nocrash 
Android - Prevent crash when setting the url property to _webSurface.
 2018-03-20 11:40:08 -07:00
Stephen Birarda
cd887b5faf
Merge pull request #12654 from huffman/feat/content-zip-upload 
Add support for .content.zip content uploads
 2018-03-20 10:07:53 -07:00
Brad Davis
f77228bbfe Fixing missing m_pi define 2018-03-20 09:58:47 -07:00
Brad Davis
659da9b0e4 Merge remote-tracking branch 'upstream/master' into gl_common 2018-03-20 09:18:56 -07:00
John Conklin II
91db0ab00f
Merge pull request #12650 from ctrlaltdavid/21798 
Messages API JSDoc
 2018-03-19 13:56:57 -07:00
Cristian Luis Duarte
17fddd9e0e RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface 2018-03-19 15:33:14 -03:00
SamGondelman
8ddf360c79 support relative paths for material images 2018-03-19 09:59:11 -07:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move 
Android joystick rotate move
 2018-03-16 17:24:15 -07:00
SamGondelman
444534f4ff model behaves correctly if missing material 
(cherry picked from commit 1e89debc4e)
 2018-03-16 15:51:37 -07:00
Stephen Birarda
472e7c003f
Merge pull request #11860 from huffman/feat/obj-baker-update 
OBJ Baking
 2018-03-16 13:54:07 -07:00
SamGondelman
984a48316d CR 2018-03-16 13:51:29 -07:00
Cristian Luis Duarte
e29fc9b461 Android - Rotate View control increased sensitivity 2018-03-16 16:28:58 -03:00
Cristian Luis Duarte
ee6c65c1ac Android - Prevent crash when setting the url property to _webSurface. 2018-03-16 12:03:26 -03:00
Cristian Luis Duarte
03cbadece5 Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-15 17:11:40 -03:00
Cristian Luis Duarte
f8f5655561 Android view control sensitivity increased. Constant replaced for a private value member. 2018-03-15 17:10:14 -03:00
Anthony J. Thibault
f6c4f6b9c4 Fix for arm IK jitter 
When in HMD mode, holding your hand controller in front of your face, would often result in a 1-2 mm pop in wrist position.
This was due to a problem in the IK elbow constraint.
When the swing rotation out of the elbow's reference frame was close to but not exactly identity it would not be properly constrainted.
But when the magnitude of that swing became big enough the constraint would engage.
This small change in swing rotation was noticable as a 1-2 mm movement in the wrist.
 2018-03-15 13:06:27 -07:00
Ryan Huffman
bee8899c46 Add support for uploading .content.zip files 2018-03-15 12:17:21 -07:00
John Conklin II
a7dc2cd12e
Merge pull request #12645 from sethalves/rename-getpos3 
Rename getpos3
 2018-03-15 10:02:00 -07:00
Bradley Austin Davis
b25beeb10b
Merge pull request #12640 from jherico/fix/web_process 
Don't leave trash web processes when changing web entity urls
 2018-03-14 19:40:13 -07:00
David Rowe
369970f120 Messages API JSDoc 2018-03-15 15:23:02 +13:00
Ken Cooke
b1dd63cfd3
Merge pull request #12619 from kencooke/audio-src-kernel-128 
Improved audio quality for streaming music
 2018-03-14 18:30:23 -07:00
Sam Gondelman
46bbfc2680
Merge pull request #12643 from gcalero/keyboard_crashing 
Possible fix for keyboard crash
 2018-03-14 15:53:17 -07:00
Gabriel Calero
d0f1aa9020 Refactor fix for keyboard crash 2018-03-14 19:18:42 -03:00
Cristian Luis Duarte
379fa9783f No touch responsibility for KeyboardMouseDevice when TouchscreenVirtualPadDevice is initialized 2018-03-14 19:09:21 -03:00
Seth Alves
ee515a44e7 Merge branch 'master' of github.com:highfidelity/hifi into rename-getpos3 2018-03-14 14:56:50 -07:00
Gabriel Calero
e744edc6a0 Possible fix for keyboard crash 2018-03-14 18:11:23 -03:00
Stephen Birarda
0c0ce1d6b8
Merge pull request #12508 from SimonWalton-HiFi/server-script 
Stop server-script URLs when deleted from entity properties (case 11244)
 2018-03-14 14:01:01 -07:00
Cristian Luis Duarte
80abe1865a Remove unused variable thisPointConsumed 2018-03-14 16:22:24 -03:00
SamGondelman
e59af8892a make same changes to gles backend from taa pr 2018-03-14 12:09:59 -07:00
Brad Davis
baa4dc3383 Don't leave trash web processes when changing web entity urls 2018-03-14 11:38:46 -07:00
Seth Alves
2fd6bc4130 rename Mesh api getPos3 to getPos, deprecate but still support getPos3 2018-03-14 10:24:44 -07:00
Sam Gateau
2487e34ee8
Merge pull request #12633 from SamGondelman/aa 
Fix HUD sphere rendering after TAA changes
 2018-03-14 09:26:25 -07:00
David Rowe
c1e256a4f3 Remove unused methods 2018-03-14 13:58:00 +13:00
SamGondelman
3b877db992 fix hud sphere 2018-03-13 14:58:29 -07:00
Ryan Huffman
11a3a86af3 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2018-03-13 14:49:26 -07:00
John Conklin II
a0e2fc3665
Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr 
Fixes for missing avatar on record replays
 2018-03-13 14:10:10 -07:00
SamGondelman
4adc357534 apply taa to text and web entities/overlays 2018-03-13 11:57:14 -07:00
Cristian Luis Duarte
a3811c2844 Coding style corrections 2018-03-13 15:56:13 -03:00
Ryan Huffman
a5e491e29d Add OBJ support to domain baker 2018-03-13 10:38:21 -07:00