Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-24 21:26:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64078 commits 28 branches 28 tags 1.2 GiB
Commit graph

64078 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thijs Wenker
79dbde6a6f optional auto-complete build (requires NPM installed) 2018-01-23 23:01:59 +01:00
Zach Fox
1920bedaf3 Fix the text filter in My Purchases 2018-01-23 13:42:38 -08:00
humbletim
9fb20bee80 remove extra space 2018-01-23 15:13:53 -05:00
humbletim
65455e7b50 Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes 2018-01-23 14:57:33 -05:00
humbletim
76cbc4ee55 separate getAsset fail/then handlers 2018-01-23 14:47:49 -05:00
luiscuenca
fddbf13796 Fix Asset Browser access from Create 2018-01-23 11:12:22 -07:00
Zach Fox
86ce9766f3 Fix security image index clear after back nav 2018-01-23 10:11:23 -08:00
Olivier Prat
8985514a31 Merge branch 'master' of http://github.com/highfidelity/hifi into locallights 2018-01-23 09:51:17 +01:00
humbletim
16ca0eebed fix atp-client AssetUtils:: namespace 2018-01-23 03:36:00 -05:00
humbletim
97889b30d5 remove unnecessary lambda capture 2018-01-23 03:21:19 -05:00
humbletim
51d8b9aea6 update and expand on js unit tests 2018-01-23 03:12:50 -05:00
humbletim
3a735c1fc7 CR feedback and code cleanup 2018-01-23 03:12:26 -05:00
luiscuenca
3c12ae8925 Fix Edit/Asset Browser in HMD mode 2018-01-22 20:52:18 -07:00
Anthony Thibault
a1009f3332
Merge pull request #12231 from hyperlogic/bug-fix/scripted-avatar-overflow 
Fix for assignment-client scripted-agent crashes
 2018-01-22 17:47:34 -08:00
John Conklin II
623d552549
Merge pull request #12233 from hyperlogic/bug-fix/scripted-avatar-overflow-rc63 
RC63: Fix for assignment-client scripted-agent crashes
 2018-01-22 17:21:16 -08:00
Thijs Wenker
67effd1ad1 create folder 2018-01-23 02:15:31 +01:00
Brad Davis
288e753eea Fix font loading from non-QRC html 2018-01-22 16:48:00 -08:00
Thijs Wenker
5885569644 fix UNIX jsdoc command order 2018-01-23 01:29:52 +01:00
Anthony J. Thibault
5926384076 Take defaultPoseFlag section into account when computing byteArraySize. 
(cherry picked from commit c13c9f301c)
 2018-01-22 16:02:35 -08:00
luiscuenca
6d6950deca Fix Interface first launch should show help 2018-01-22 16:25:58 -07:00
Dante Ruiz
2d70e76546 fix merge conflict 2018-01-22 15:15:11 -08:00
Brad Davis
6a91d549ce Fix stylus overlay 2018-01-22 15:08:26 -08:00
Brad Davis
8ae0b09ea2 Merge remote-tracking branch 'upstream/master' into android 2018-01-22 15:07:30 -08:00
Anthony J. Thibault
c13c9f301c Take defaultPoseFlag section into account when computing byteArraySize. 2018-01-22 14:57:09 -08:00
Thijs Wenker
e8955fcd32 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 2018-01-22 23:37:24 +01:00
Atlante45
5bd0cc1a97 Merge branch 'stable' of https://github.com/highfidelity/hifi into RC63 2018-01-22 13:40:17 -08:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703 
Revert "Display both lasers on tablet and Web surfaces"
 2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar 
Fix for avatars with crooked spine/head when exiting HMD mode
 2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master 
Fix lockup when no midi devices present.
 2018-01-22 11:25:46 -08:00
John Conklin II
8d028d4bd4
Merge pull request #12220 from RebeccaStankus/API-Debugger-UI 
Updated UI to fit Toolkit Standards
 2018-01-22 10:30:48 -08:00
Thijs Wenker
f4e6606c8d fix MyAvatar JS API typo 2018-01-22 19:01:13 +01:00
Thijs Wenker
4ff3c9e046 fix jsdoc output folder 2018-01-22 19:00:45 +01:00
Anthony J. Thibault
52f1803ea8 code review feedback 2018-01-22 09:55:39 -08:00
Thijs Wenker
58216b947c removal of unnecessary JS export (for now) 2018-01-22 18:54:24 +01:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2 
Commerce: Pixel-perfect "Send Money" UI
 2018-01-22 09:39:23 -08:00
Thijs Wenker
483074b11e jsdoc cmake fixes 2018-01-22 17:59:01 +01:00
Olivier Prat
43f7bb5f56 Fixed compilation error due to really long shader 2018-01-22 16:50:03 +01:00
Olivier Prat
a807e41ff4 Merge branch 'master' of http://github.com/highfidelity/hifi into locallights 2018-01-22 16:05:54 +01:00
Seth Alves
45a00bebc0
Merge pull request #12217 from luiscuenca/sortOrderFix 
Fix sortOrder param on tablet buttons
 2018-01-21 10:40:25 -08:00
ZappoMan
4ad5d34a10 more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel 2018-01-20 17:20:42 -08:00
Bruce Brown
f7caba5295 de-bounce Midi::USBchanged signal. 
Debounced USBchanged signal to prevent pauses.
 2018-01-20 11:17:47 -08:00
luiscuenca
b0f21c6931 sorter variable names 2018-01-20 07:09:16 -07:00
ZappoMan
ab9041bcab remove LOAD DEFAULT SCRIPTS from General Preferences, since it already exists on Running Scripts 2018-01-20 00:14:44 -08:00
ZappoMan
027a1e69f4 some settings cleanup, adding description to Send Data 2018-01-20 00:08:06 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Brad Hefta-Gaub
d7fe3bcd15
Merge pull request #12224 from ZappoMan/emoteApp 
new icon and button layout
 2018-01-19 17:43:00 -08:00
Bruce Brown
cbc8698e9a Fix Bitwise operators. 2018-01-19 16:59:47 -08:00
Zach Fox
1dde640a40 -_- 2018-01-19 16:06:01 -08:00
Ken Cooke
e2e4e7f423 Re-implement collision sound pitch shifting 2018-01-19 16:03:59 -08:00
ZappoMan
f6062ebfcc new icon and button layout 2018-01-19 16:00:08 -08:00