Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 11:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66106 commits 71 branches 56 tags 1.2 GiB
Commit graph

66106 commits

This branch
This branch
All branches
Author SHA1 Message Date
amantley
95f1d0e4fa added get and set functions for the activate recenter variables 2018-03-28 10:33:00 -07:00
amantley
9f3b82a417 added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly 2018-03-27 18:21:14 -07:00
Sam Gondelman
11f5e7812b
Merge pull request #12702 from SamGondelman/android 
Android: Fix tonemapping
 2018-03-23 17:43:57 -07:00
SamGondelman
a19f71e759 fix tonemapping on android 2018-03-23 14:16:47 -07:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android 
Android: Stats, disable IK, reduce impact of InputRecorder
 2018-03-23 11:08:50 -07:00
Ryan Huffman
e90c051744
Merge pull request #11872 from huffman/feat/version-wo 
Add asset server baking versioning
 2018-03-23 08:27:37 -07:00
John Conklin II
c61ed697df
Merge pull request #12552 from vladest/assetbrowser_cosmetics 
Wrap text in query dialogs. Add right margins for input field and but…
 2018-03-22 17:56:47 -07:00
John Conklin II
0bc23456c3
Merge pull request #12682 from ctrlaltdavid/21807 
JSDoc that an entity's clientOnly property can be set at entity creation
 2018-03-22 17:55:45 -07:00
Ryan Huffman
d2ae30f8e0 Disable support for baking scripts in the Asset Server 2018-03-22 16:22:59 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1 
Commerce: Item Updates!
 2018-03-22 15:40:22 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
John Conklin II
6d9892856d
Merge pull request #12510 from sethalves/serverless-domains 
Serverless domains
 2018-03-22 14:06:49 -07:00
Stephen Birarda
1d9b00d7bb
Merge pull request #12685 from huffman/fix/backup-download-timeout 
Update content backup downloads to be asynchronous
 2018-03-22 13:45:49 -07:00
Stephen Birarda
e8bea3a611
Merge pull request #12369 from simon-walton/BugFix 
Lexer code has confusion between strings and chars
 2018-03-22 12:03:47 -07:00
Sam Gondelman
bbded2215d
Merge pull request #12665 from gcalero/android_bottombar_resize 
Android - Resize bottombar after window size changes (to always fill …
 2018-03-22 11:15:02 -07:00
John Conklin II
b6920a503c
Merge pull request #12618 from vladest/hificonstants_as_object 
Hificonstants as object
 2018-03-22 11:03:05 -07:00
Sam Gondelman
e46a8f022c
Merge pull request #12695 from gcalero/fix/current_context 
Fix/current context
 2018-03-22 10:54:34 -07:00
Ryan Huffman
fdeae4c11a Fix missing semicolon in content.js 2018-03-22 10:24:29 -07:00
Ryan Huffman
5485f60677 Add removal of old consolidated backups 2018-03-22 10:23:18 -07:00
Seth Alves
22f5752316
Merge pull request #27 from druiz17/serverless-domains 
adding content to resources
 2018-03-22 09:24:16 -07:00
Dante Ruiz
cea0f98aae reverting files 2018-03-22 09:20:27 -07:00
Dante Ruiz
14061a88d3 removing files 2018-03-22 09:07:24 -07:00
Dante Ruiz
f5a954d08e Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-22 09:06:42 -07:00
Gabriel Calero
12b289bbc1 Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread 2018-03-22 12:38:56 -03:00
Simon Walton
10f3032746 Compare QString w/ char*, not char 2018-03-21 23:09:46 -07:00
Seth Alves
6c1d713968 review 2018-03-21 19:21:57 -07:00
Seth Alves
b551b144a7 remove unneeded setIsConnected call 2018-03-21 19:15:27 -07:00
Seth Alves
ed0778a68a remove unused json file 2018-03-21 17:07:31 -07:00
Seth Alves
4f20a87c6d review 2018-03-21 16:26:02 -07:00
Seth Alves
916ed3a0d4 review 2018-03-21 16:18:31 -07:00
Brad Davis
d529d7b1d3 Remove whitespace before shader version line 2018-03-21 16:07:04 -07:00
Seth Alves
ae94ab3d67 make sure _sockAddr is cleared if the new url isn't a hifi:// one 2018-03-21 15:28:12 -07:00
Seth Alves
196f621a60 remove unneeded setSessionUUID 2018-03-21 15:21:49 -07:00
Ryan Huffman
dc694fb0b7 Update content backup downloads to be asynchronous 
Previously backups would be consolidated into a full .zip when the
backup was requested. Because of the potential for a large number of
assets, this could take awhile, causing a browser to fail due to timeout
before the backup was available. This change splits the download
endpoint into 2 parts - one to request information about a backup and
possibly kick off a consolidation, and another to request the actual
file once the consolidate backup is available.
 2018-03-21 15:02:38 -07:00
Seth Alves
bea7ee42e2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 14:30:07 -07:00
Seth Alves
ef52ae13ee rearrange domain-url-changed signals 2018-03-21 14:30:00 -07:00
Ryan Huffman
655636c44f Remove redundant if block in AssetServer.cpp 2018-03-21 12:16:12 -07:00
Ryan Huffman
42324d79f1 Remove unused DS settings.js change 2018-03-21 12:15:54 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex 
Materials on primitives
 2018-03-21 12:08:24 -07:00
Stephen Birarda
e05ee55495
Merge pull request #12691 from huffman/fix/oven-exit-crash 
Fix crashes on exit because of ResourceManager thread destruction
 2018-03-21 11:56:06 -07:00
John Conklin II
283aff71ec
Merge pull request #12612 from jherico/gl_common 
Break out common GL and GLES code into a single shared library
 2018-03-21 11:28:24 -07:00
John Conklin II
5bd3d0fab9
Merge pull request #12647 from birarda/feat/client-only-installer 
add a CLIENT_ONLY build option and handle for installer
 2018-03-21 11:20:36 -07:00
John Conklin II
3937f43fa5
Merge pull request #12648 from SimonWalton-HiFi/serversExist-crash 
EntityScriptServer should wait for script engine to complete for deleting itself
 2018-03-21 11:19:50 -07:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
Ryan Huffman
00aa564d84 Fix crashes on exit because of ResourceManager thread destruction 2018-03-21 10:43:31 -07:00
John Conklin II
86afa211eb
Merge pull request #12674 from highfidelity/RC65.1 
Beta Release 65.1, includes up to build 7977
 2018-03-21 10:34:44 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776 
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
 2018-03-21 09:27:51 -07:00
Bradley Austin Davis
d5d8e4c0b0 Restoring geometry shader 2018-03-20 18:28:53 -07:00
Sam Gateau
4341347148
Merge pull request #12639 from SamGondelman/aa 
Use correct platform-specific gpu library
 2018-03-20 14:47:26 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix 
Model behaves correctly if missing material
 2018-03-20 14:27:21 -07:00