Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 18:48:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68554 commits 6 branches 1 tag 1.1 GiB
Commit graph

68554 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gabriel Calero
b2fe5a6d63 Workaround for android buffer corruption issue 2018-06-01 15:00:00 -03:00
John Conklin II
7c5da8494f
Merge pull request #13260 from wayne-chen/toggleAdvancedMovementFile-RC68-case-15453 
JavaScript exception in toggleAdvancedMovementForHandControllers.js (RC68)
 2018-06-01 10:50:57 -07:00
Seth Alves
708cbbc984
Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453 
JavaScript exception in toggleAdvancedMovementForHandControllers.js
 2018-06-01 10:48:24 -07:00
Simon Walton
f58e1ebdd9 Only take down tablet if it was brought up 2018-06-01 10:41:08 -07:00
Simon Walton
2d9a5c62c1 Clean-up for compiler warnings 2018-06-01 10:02:41 -07:00
howard-stearns
84f5f0a653 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-01 09:58:08 -07:00
Seth Alves
97b3fdfe68 make legacy collisionless property work right 2018-06-01 09:34:34 -07:00
John Conklin II
d5640558c1
Merge pull request #13266 from ctrlaltdavid/21884-68 
Fix properties not populating particle explorer tab (RC68)
 2018-06-01 09:33:04 -07:00
John Conklin II
194c33bf19
Merge pull request #13254 from danteruiz/add-back-reload-scripts 
adding back reload scripts shortcut and clean up AboutUtil
 2018-06-01 09:31:13 -07:00
Brad Hefta-Gaub
81d873a273
Merge pull request #13285 from hyperlogic/bug-fix/make-rotation-constraint-tests-pass 
Make RotationConstraintTests pass
 2018-05-31 21:37:36 -07:00
Simon Walton
c277cc7574 Fix minor error 2018-05-31 18:39:25 -07:00
Simon Walton
7d1d7f7bcd Closing the open tablet dialog - try harder 2018-05-31 18:31:53 -07:00
SamGondelman
86ee5c12d8 merge and update based on sam's changes 2018-05-31 17:53:36 -07:00
Anthony J. Thibault
ddce4750ee Make RotationConstraintTests pass 
A previous bug fix made ElbowConstraint::apply() always return true.
Because it as always modifying the rotation via swingTwistDecomposition().
The tests now no longer check for a false value.
 2018-05-31 17:14:16 -07:00
Thijs Wenker
3779a4780e Prevent the cursor from being stuck on the most outer edges of the screen 2018-06-01 02:07:02 +02:00
Stephen Birarda
de6db6f0cd remove confusing sandbox content update/backup system 2018-05-31 15:56:59 -07:00
Thijs Wenker
a06c9eccca - fix create-app camera orbit to not jump around on secondary monitor 
- style fixes entityCameraTool.js
 2018-06-01 00:16:42 +02:00
Wayne Chen
1a128abdfd adding alternate solution. 2018-05-31 15:11:20 -07:00
Wayne Chen
9f20d52d01 adding alternate solution. 2018-05-31 15:05:33 -07:00
Wayne Chen
d66b548fc5 fixing typo in script file. 2018-05-31 15:04:29 -07:00
Sam Gateau
f372e25a9f
Merge pull request #13247 from NissimHadar/DailyTests 
Daily tests
 2018-05-31 14:50:32 -07:00
howard-stearns
e8e12eef8f checkpoint 2018-05-31 14:42:52 -07:00
John Conklin II
e51d2aa87f
Merge pull request #13277 from Cristo86/android_joystick_jumps_fix_rc68 
RC68: Fix joystick and view control bug that makes it bounce
 2018-05-31 14:41:54 -07:00
David Rowe
146f871bec Don't modify function parameter 2018-06-01 09:39:39 +12:00
David Rowe
3c5a779a98 Don't modify function parameter 2018-06-01 09:36:28 +12:00
John Conklin II
611159f65f
Merge pull request #13188 from SimonWalton-HiFi/placename-crash 
Initialize Qt's use of openssl lib before calling RSA code
 2018-05-31 14:34:24 -07:00
John Conklin II
ec3f9549f1
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934 
Fix EntityScriptingInterface::getChildrenIDs function
 2018-05-31 14:27:25 -07:00
Sam Gateau
46d055a488
Merge pull request #12649 from samcake/punk 
Fix addressing the avatar mesh visibility switch bug
 2018-05-31 14:16:04 -07:00
Simon Walton
7598c7aaf3 Remove tablet message-box when required 
Desktop request was being honoured but not HMD.
 2018-05-31 13:52:06 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
Cristian Luis Duarte
f99b2dd23f Android - Fix joystick and view control bug that makes it bounce 2018-05-31 16:02:41 -03:00
SamGondelman
1470170296 lock weak resource 2018-05-31 11:54:37 -07:00
John Conklin II
9d5d4c52c0
Merge pull request #13262 from danteruiz/add-back-notifactions 
adding back notifcations to default scripts
 2018-05-31 11:51:46 -07:00
luiscuenca
60758dec8d Check for null pointer 2018-05-31 11:32:45 -07:00
John Conklin II
4175825093
Merge pull request #13215 from AndrewMeadows/activate-on-action-removal 
activate RigidBody when removing physics Action
 2018-05-31 11:20:03 -07:00
Dante Ruiz
caa7f64865 fixing show overlays menu item 2018-05-31 10:58:04 -07:00
Zach Fox
259803f856 MS14615: Prevent memory overuse when minimized 2018-05-31 10:30:25 -07:00
Cristian Luis Duarte
688fad1776 Android - Fix joystick and view control bug that makes it bounce 2018-05-31 14:11:28 -03:00
David Back
ac33f33828 update version from json in toByteArray 2018-05-31 09:24:16 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
Sam Gondelman
ae3b933a80 Merge branch 'master' into etc2comp 2018-05-30 17:17:03 -07:00
John Conklin II
f5a0f3d907
Merge pull request #13261 from gcalero/android_signing_and_remove_audiobar 
RC68: Android signing and remove audiobar
 2018-05-30 17:14:46 -07:00
howard-stearns
b0d3729d4d Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-30 17:09:57 -07:00
howard-stearns
bdd38cef7a checkpoint 2018-05-30 17:09:13 -07:00
NissimHadar
bea21e3a68 WIP. 2018-05-30 17:06:49 -07:00
NissimHadar
6717a16098 WIP. 2018-05-30 17:04:19 -07:00
NissimHadar
51b1188bdb WIP. 2018-05-30 17:01:47 -07:00
NissimHadar
df668e44ca WIP. 2018-05-30 16:59:53 -07:00
NissimHadar
c1bc3bd154 WIP. 2018-05-30 16:58:35 -07:00
NissimHadar
d01d774f76 WIP. 2018-05-30 16:51:17 -07:00