Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-27 22:50:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
68342 commits 71 branches 59 tags 1.2 GiB
Commit graph

5799 commits

Author SHA1 Message Date
Zach Fox
93eba5fe5e
Merge pull request #13293 from zfox23/MS7224_cubeSnapshots 
Fix MS7224: Add dimensions to printed Snapshot entity
 2018-06-07 12:52:20 -07:00
John Conklin II
067fa46355
Merge pull request #13265 from wayne-chen/toggleSpaceMode 
Re-adding toggleSpaceMode function
 2018-06-07 11:21:28 -07:00
John Conklin II
389bddb0f4
Merge pull request #13255 from ctrlaltdavid/21884 
Fix properties not populating particle explorer tab
 2018-06-07 09:42:45 -07:00
John Conklin II
d39eb250e1
Merge pull request #13310 from ElderOrb/FB15569 
FB15569 - Debug default scripts no longer on developer menu
 2018-06-07 09:41:59 -07:00
John Conklin II
66e2bebcbf
Merge pull request #13279 from thoys/fix/create-camera 
Fix MS13500: create-app camera orbit to not jump around on secondary monitor
 2018-06-07 09:38:10 -07:00
David Rowe
32c21a1397 Fix particle property value reverting to old value when switch tabs 2018-06-07 12:22:56 +12:00
David Rowe
3e100fb141 Merge branch 'master' into 21884 2018-06-07 10:46:53 +12:00
Alexander Ivash
b954ac6759 FB15569 - Debug default scripts no longer on developer menu 2018-06-06 03:43:27 +03:00
David Rowe
b4b63187ae Fix typo 2018-06-05 08:48:10 +12:00
SamGondelman
8af1beca8d add isGroupCulled for model overlays 2018-06-04 12:07:57 -07:00
Zach Fox
cf7a3d1af6 Fix MS7224: Add dimensions to printed Snapshot entity 2018-06-04 11:30:29 -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
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
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
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
David Rowe
3c5a779a98 Don't modify function parameter 2018-06-01 09:36:28 +12:00
Wayne Chen
34120da63f re-adding toggleSpaceMode 2018-05-30 16:06:34 -07:00
Dante Ruiz
072d8b70b1 adding back notifcations 2018-05-30 13:36:02 -07:00
David Rowe
8c9bdf51a7 Remove superfluous variable 2018-05-30 17:16:08 +12:00
David Rowe
03cec8cb54 Fix properties not populating particle explorer tab 2018-05-30 17:15:33 +12:00
Gabriel Calero
bb73af7230 Show stats button only in debug mode. Add isDebugMode to Script public interface 2018-05-29 17:21:44 -03:00
Wayne Chen
8453c7baba reverting commit 802cedf1bc regarding toggleSpaceMode 2018-05-25 09:25:05 -07:00
Wayne Chen
89f7eb0b30 Adding fix for enabling saved front/back advanced controls. 2018-05-25 09:21:01 -07:00
Wayne Chen
b86d74b4b7 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-05-24 15:08:23 -07:00
John Conklin II
04bf8f851f
Merge pull request #13219 from samcake/one 
Bringing Evolution to the Job Engine Task library developed in the workload project to master
 2018-05-24 13:30:16 -07:00
Wayne Chen
3d0e0da42f re-adding removed toggleSpaceMode function 2018-05-24 11:08:26 -07:00
samcake
e4048c8f23 remove extra comments 2018-05-23 15:12:21 -07:00
John Conklin II
3e665fb616
Merge pull request #13179 from dback2/cloneables 
Server-Managed Cloneables + Cloneable Properties
 2018-05-23 12:40:27 -07:00
samcake
4985207b45 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-22 17:40:54 -07:00
Dante Ruiz
c4f39841f5 fix another menu name changes that broke snapshot 2018-05-22 10:46:20 -07:00
Dante Ruiz
9df79462ad fix snapshot 2018-05-22 09:06:10 -07:00
Liv Erickson
604b3cac1c check for null entities in grab, add conversion for old userdata cloneable 2018-05-21 16:19:43 -07:00
samcake
03271d6818 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-21 10:38:44 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Anthony Thibault
4f69ae253d
Merge pull request #12906 from Triplelexx/21794_move_inspect 
WorkList #21794: Modify inspect.js to work with Avatars as well as entities
 2018-05-21 09:40:42 -07:00
Sam Gateau
e1690a28e1 Merging with master 2018-05-20 23:04:11 -07:00
Liv
0927cadf10
Merge pull request #13093 from RebeccaStankus/edit-bug-14671 
moved checkEditPermissionsAndUpdate function to higher scope
 2018-05-18 16:44:53 -07:00
Liv
99960b3024
Merge pull request #13085 from ctrlaltdavid/21863 
Fix intermittent ability to select particle and light entities
 2018-05-18 16:44:11 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Liv Erickson
de05388ebf Merge branch 'master' of github.com:highfidelity/hifi into clone-server 2018-05-18 10:42:26 -07:00
RebeccaStankus
27638b9ced Removing duplicate function 2018-05-18 09:20:03 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
Clement
da08d747dc Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-05-17 12:10:08 -07:00
David Back
900b373c96 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-17 09:04:28 -07:00
Gabriel Calero
96da032b16 Add missing js to haptic feedback change 2018-05-17 11:49:44 -03:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
David Rowe
6c3174ccf1 Make particle / light icon translate x-z when inside bounding box 2018-05-17 17:04:12 +12:00
David Rowe
801a4b9aba Make laser click in sky deselect entity 2018-05-17 15:09:23 +12:00