Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
63094 commits 29 branches 0 tags 1.1 GiB
Commit graph

63094 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Brad Davis
a2c2e7d9ff Fixes to load cubemap 2018-01-08 14:43:54 -08:00
Brad Davis
3d186efbac Merge remote-tracking branch 'gcalero/android_render_pr' into android_nov 2018-01-08 14:04:52 -08:00
Gabriel Calero
7fbd23f36b Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr 2018-01-08 17:38:28 -03:00
Gabriel Calero
6050737e7c Resolving comments in PR 2018-01-08 17:36:08 -03:00
Bradley Austin Davis
0c6c446705
Merge branch 'android' into android_render_pr 2018-01-08 13:35:25 -05:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr 2018-01-08 12:49:52 -05:00
Brad Davis
e0e89604cc Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-08 09:44:14 -08:00
Brad Davis
827acefa1a Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-08 09:12:03 -08:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser 
Consistent go to user
 2018-01-07 11:07:39 -08:00
Anthony Thibault
1a97d1de0f
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter 
Added exponential smoothing filter for vive pucks.
 2018-01-05 16:50:55 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection 
Fix bugs related to inspecting entities with hand controllers
 2018-01-05 15:50:00 -08:00
Gabriel Calero
6d732dd8ba Add missing Qt dependencies to gradle script 2018-01-05 19:45:02 -03:00
Andrew Meadows
4745a0e32d
Merge pull request #12093 from AndrewMeadows/simulation-ownership-004 
more stable simulation ownership for system of constraints
 2018-01-05 14:17:53 -08:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661 
Laser auto-on with tablet and Web overlays
 2018-01-05 14:08:01 -08:00
Brad Hefta-Gaub
aebd098e6e
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting 
WL#21654: Make the Asset Browser Sort Case Insensitive
 2018-01-05 13:34:39 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov 
Updating android toolchain for QML
 2018-01-05 13:34:03 -08:00
Brad Hefta-Gaub
6a3609093d
Merge pull request #12051 from dback2/polyobjimportfixes 
Poly obj import fixes
 2018-01-05 13:33:29 -08:00
Seth Alves
487dab641f
Merge pull request #12090 from AndrewMeadows/simulation-ownership-003 
more stable simulation ownership
 2018-01-05 12:27:52 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix 
Update model render items on texture load and fix no haze issue
 2018-01-05 12:26:56 -08:00
David Back
ac1c398b9d
Merge pull request #11669 from dback2/mergeAccountGlobalServices 
merge AccountScriptingInterface into GlobalServicesScriptingInterface
 2018-01-05 11:34:53 -08:00
David Rowe
5431b7137b Code review 2018-01-06 08:27:24 +13:00
David Back
76f278f899
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:56:12 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:54:59 -08:00
Melissa Brown
933720fb10
Merge pull request #12012 from Delanir/Case10633 
Cases 10632 and 10633 Particle Explorer UI
 2018-01-05 10:46:41 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed 
Delete web3d overlay "resolution" property JSDoc
 2018-01-05 10:38:07 -08:00
Seth Alves
2071d42d25
Merge pull request #12088 from ElderOrb/FB11008 
11008 GoTo app does not focus on address bar when opened
 2018-01-05 10:07:36 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs 
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
 2018-01-05 09:07:54 -08:00
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering 
Log filtering
 2018-01-05 08:40:41 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix 
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
 2018-01-05 08:15:48 -08:00
Sam Gondelman
5cf25a20c9
use correct model ptr 2018-01-04 21:21:58 -08:00
David Rowe
d6a0457ee5 Delete web3d overlay "resolution" property JSDoc 2018-01-05 16:48:37 +13:00
David Rowe
69dff9ac09 Remove unused code 2018-01-05 16:16:55 +13:00
David Rowe
4b2ed44322 Reduce incidence of tablet screen being rotated w.r.t. model 2018-01-05 16:16:42 +13:00
David Rowe
936b5f3571 Laser on tablet bezel as well as screen and "x" button 2018-01-05 16:15:59 +13:00
Lexx
85b54f82d8
revert sorting change mistake 2018-01-05 01:58:23 +00:00
SamGondelman
a9d5dda976 always push default haze to current frame 2018-01-04 17:54:23 -08:00
David Back
7558b00467 better fix for model scale floor, remove abs 2018-01-04 17:49:39 -08:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor 
defang accidental disable of MyAvatar's default motor
 2018-01-04 17:44:22 -08:00
David Back
307867a91f adjust to for loop 2018-01-04 16:53:35 -08:00
Andrew Meadows
623a29b14a add ownership infection for constraints 2018-01-04 16:48:06 -08:00
David Back
6b9658f8cf merge 2018-01-04 16:41:58 -08:00
Andrew Meadows
01fd6dc8f6 add comments to make code more clear 2018-01-04 15:53:03 -08:00
Andrew Meadows
a51d83c6e4 rollback automatic priority promotion to RECRUIT 2018-01-04 15:53:03 -08:00
Andrew Meadows
6638b1deae fix bug causing sim ownership thrash 2018-01-04 15:53:03 -08:00
Andrew Meadows
7e01f97f8f more correct volunteer ownership priority promotion 2018-01-04 15:53:03 -08:00
Seth Alves
9e8e15d620
Merge pull request #12074 from AndrewMeadows/simulation-ownership 
fix bug preventing simulation ownership on localhost domain
 2018-01-04 15:48:54 -08:00
SamGondelman
eb0d09360a Merge remote-tracking branch 'upstream/master' into overlayFix 2018-01-04 15:47:20 -08:00
Zach Fox
ea29d8bde0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixHandControllerInspection 2018-01-04 15:41:27 -08:00
David Back
ac8b8da7b1 Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-04 15:30:57 -08:00