Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 18:40:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
25dae2f24e Merge pull request #11499 from samcake/blue 
Moving Camera update and render frame to Game Loop (Main thread)
 2017-10-04 18:42:02 -07:00
David Rowe
4855e0f528 Fix children's rotations drifting when scale group 2017-10-05 14:36:25 +13:00
Sam Gateau
02bcbe6d5f Merge pull request #11512 from AndrewMeadows/more-profile-details 
expose performance hot spot in stats details
 2017-10-04 18:34:19 -07:00
LaShonda Hopper
18d884f6c4 [Case 6491] eslint pass: Fixes no-multiple-empty-lines issues. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:51:06 -04:00
LaShonda Hopper
e9ae2099f3 [Case 6491] eslint pass: Fixes indent issues. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:37:57 -04:00
Clément Brisset
c43deabe88 Merge pull request #11502 from misslivirose/fix/demo-ac 
Updating placeholder.js to use a url that points to example scripts
 2017-10-04 17:33:53 -07:00
SamGondelman
3a6e84e681 trying to fix model issue 2017-10-04 17:26:12 -07:00
LaShonda Hopper
ac81b22cc9 [Case 6491] eslint pass: Fixes references to SelectionManager (details below). 
SelectionManager was being referred to as selectionManager.

* eslint pass used .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:24:20 -04:00
Chris Collins
e5405ef5df Merge pull request #11525 from SamGondelman/models 
Try to improve performance without messing up model loading
 2017-10-04 16:42:51 -07:00
Zach Fox
27d6cc2657 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-04 15:49:33 -07:00
Zach Fox
9d51d40af4 Merge pull request #11489 from vladest/login_dialog_rework 
Login dialog rework
 2017-10-04 15:47:44 -07:00
Zach Fox
4cfb860e23 Wow, this actually seems to be working 2017-10-04 15:45:12 -07:00
David Rowe
63e7521711 Merge branch 'master' into vr-edit-a 2017-10-05 11:29:49 +13:00
Atlante45
f8aa3d72de Update macOS build guide 2017-10-04 15:21:52 -07:00
Zach Fox
f974672e7b Working way better than I expected 2017-10-04 15:19:06 -07:00
Clément Brisset
74fd69ac2d Merge pull request #11523 from Atlante45/new-master 
RC56 into Master
 2017-10-04 15:17:52 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
druiz17
9de1ca4e1a allow farGrab module to run when stylus is visible 2017-10-04 15:04:27 -07:00
Clément Brisset
8dd00e80ac Merge pull request #11334 from NickShaffner/patch-1 
brew tap homebrew/versions no longer works. (or is needed)
 2017-10-04 14:41:45 -07:00
LaShonda Hopper
a5b913a8b9 [Case 6491] Fixes minor spacing issue, on while loop missed previous eslint pass. 
Changes Committed:
    modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 17:36:28 -04:00
Zach Fox
f7ea50ef3b Free memory 2017-10-04 14:02:28 -07:00
SamGondelman
215193ad90 try to improve performance 
(cherry picked from commit a5f5f9fc5d)
 2017-10-04 13:50:35 -07:00
Nissim Hadar
860d7e6e4c Merge branch 'master' into hazeZone 2017-10-04 13:48:29 -07:00
Nissim Hadar
eef778a463 Replaced uint8_t with uint32_t in server packet. 2017-10-04 13:47:13 -07:00
samcake
d773b40a63 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-04 13:25:14 -07:00
Zach Fox
cf7c1934f8 Progress? 2017-10-04 13:16:33 -07:00
Nissim Hadar
62cfaaaf38 Sam's corrections. 2017-10-04 12:56:14 -07:00
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -07:00
SamGondelman
a5f5f9fc5d try to improve performance 2017-10-04 12:05:13 -07:00
Andrew Meadows
e3ea013d5f Merge pull request #11518 from SamGondelman/avatarRay 
Fix calling AvatarManager.findRayIntersection() from script
 2017-10-04 12:04:30 -07:00
Zach Fox
0f9df93097 Merge pull request #11524 from zfox23/commerce_fixBuyingFreeItems 
Fix buying free items using Commerce system
 2017-10-04 11:59:40 -07:00
Nissim Hadar
2ce86ebfae WIP - working on byte order in server messages. 2017-10-04 11:56:35 -07:00
SamGondelman
477dfdff1e wip hud layering and fix crashes 2017-10-04 11:45:21 -07:00
vladest
86e8076362 Fix puntuation mode 2017-10-04 20:30:25 +02:00
Zach Fox
1ed10ecf59 Fix passphrase crash 2017-10-04 11:05:17 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
Zach Fox
23245e2fb9 Modify context overlay filter 2017-10-04 10:39:23 -07:00
vladest
073fa81d5b Merge branch 'master' into login_dialog_rework 2017-10-04 19:37:38 +02:00
vladest
0a505617df Implemented single keyboard instance for all Tablet login dialog items 2017-10-04 19:33:36 +02:00
Nissim Hadar
71b49e5001 Merge branch 'master' into hazeZone 2017-10-04 10:25:06 -07:00
Nissim Hadar
3f677ec7c9 WIP - working on byte order in server messages. 2017-10-04 10:23:59 -07:00
Zach Fox
2cdd5c29f3 Uncertified rez rights 2017-10-04 09:58:29 -07:00
Seth Alves
3ec9f0c496 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-04 09:38:33 -07:00
Zach Fox
fcafbef109 Fix buying free items using Commerce system 2017-10-04 09:34:32 -07:00
Andrew Meadows
cfc4696585 Merge pull request #11516 from druiz17/hud-module-fix 
fix hudOverlayPointer logic
 2017-10-04 08:19:53 -07:00
Nissim Hadar
8c430d36fa WIP - working on byte order in server messages. 2017-10-03 21:59:40 -07:00
Nissim Hadar
76f843c741 WIP - working on byte order in server messages. 2017-10-03 21:46:50 -07:00
Nissim Hadar
75509b9ecb WIP - working on byte order in server messages. 2017-10-03 21:39:41 -07:00
Nissim Hadar
4019c3bc10 WIP - working on byte order in server messages. 2017-10-03 21:36:20 -07:00
Nissim Hadar
3505fedc00 WIP - working on byte order in server messages. 2017-10-03 21:34:21 -07:00