Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 07:13:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
68361 commits 76 branches 59 tags 1.2 GiB
Commit graph

68361 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cristian Luis Duarte
688fad1776 Android - Fix joystick and view control bug that makes it bounce 2018-05-31 14:11:28 -03:00
David Back
ac33f33828 update version from json in toByteArray 2018-05-31 09:24:16 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
Sam Gondelman
ae3b933a80 Merge branch 'master' into etc2comp 2018-05-30 17:17:03 -07:00
NissimHadar
bea21e3a68 WIP. 2018-05-30 17:06:49 -07:00
NissimHadar
6717a16098 WIP. 2018-05-30 17:04:19 -07:00
NissimHadar
51b1188bdb WIP. 2018-05-30 17:01:47 -07:00
NissimHadar
df668e44ca WIP. 2018-05-30 16:59:53 -07:00
NissimHadar
c1bc3bd154 WIP. 2018-05-30 16:58:35 -07:00
NissimHadar
d01d774f76 WIP. 2018-05-30 16:51:17 -07:00
NissimHadar
06c167cc68 Add error to failure name. 2018-05-30 16:49:36 -07:00
NissimHadar
78f04f84c5 Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-30 16:45:53 -07:00
NissimHadar
c8a04911f4 Interface respects Show Overlay menu checkbox on start up. 2018-05-30 16:45:29 -07:00
Wayne Chen
34120da63f re-adding toggleSpaceMode 2018-05-30 16:06:34 -07:00
samcake
37c1f4fc06 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-30 16:05:46 -07:00
Wayne Chen
be7d06b644 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-05-30 16:02:33 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache 
Shader load time performance optimiziations
 2018-05-30 13:55:34 -07:00
Simon Walton
a3324c5616 Remove empty destructor 2018-05-30 13:52:26 -07:00
Simon Walton
8fb5d1b92d Make RSA key-pair class a Runnable that's owned by a threadpool 2018-05-30 13:41:08 -07:00
samcake
457b77ca09 fixing static definition maybe 2018-05-30 13:37:32 -07:00
Dante Ruiz
072d8b70b1 adding back notifcations 2018-05-30 13:36:02 -07:00
Stephen Birarda
b9e9c952de fix setting of abbreviated SHA for master builds 2018-05-30 12:15:39 -07:00
Stephen Birarda
33a122c08e remove short SHA where it should not appear 2018-05-30 12:05:07 -07:00
Sam Gondelman
46a6334c72
Merge pull request #13249 from gcalero/android_remove_mic_bar 
Android: Update Application.cpp
 2018-05-30 14:31:31 -04:00
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
Sam Gondelman
0d6cd8de58
Merge pull request #13242 from gcalero/signing_apk 
Sign release apk. Remove daydream intent from manifest
 2018-05-30 13:45:54 -04:00
Wayne Chen
81eea5d8d1
Merge pull request #13213 from wayne-chen/filebrowser-case-14515 
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
 2018-05-30 10:43:58 -07:00
NissimHadar
3b44b3a31f Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-30 10:23:10 -07:00
Gabriel Calero
a36c41fc13 Make APK release signature optional 2018-05-30 12:43:44 -03:00
Dante Ruiz
c4358aad81 remove dead code in Application::keyPressEvent 2018-05-30 07:33:32 -07:00
Gabriel Calero
4b9295b9be Merge remote-tracking branch 'upstream/master' into signing_apk 2018-05-30 11:16:16 -03: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
Andrew Meadows
bc57003cfb activate body before disconnecting action from entity 2018-05-29 17:56:41 -07:00
Andrew Meadows
5d3502ed88 activate body when removing action 2018-05-29 17:56:41 -07:00
Dante Ruiz
543a721a11 fix headers 2018-05-29 17:55:42 -07:00
samcake
873cabe284 Cleaning the code 2018-05-29 17:46:25 -07:00
Dante Ruiz
ea10dc176a adding back reload scripts 2018-05-29 17:38:02 -07:00
Simon Walton
66d39667e1 AccountManager destructor waits for any RSA key thread 2018-05-29 17:04:37 -07:00
David Rowe
08cb5c7191 Fix JSDoc example typo 2018-05-30 10:25:16 +12:00
David Rowe
0db440931e Miscellaneous JSDoc fixes 2018-05-30 10:02:30 +12:00
David Rowe
ac0607b5ae Review Entites.cloneEntity() JSDoc and add JSDoc for new properties 2018-05-30 10:02:10 +12:00
Gabriel Calero
b99f901595 Merge branch 'android_remove_mic_bar' of https://github.com/gcalero/hifi into android_remove_mic_bar 2018-05-29 17:22:04 -03: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
Anthony Thibault
aae38165b8
Merge pull request #13248 from birarda/tools/wireshark-dissectors 
add split wireshark dissectors for avatar/entity protocols
 2018-05-29 13:08:25 -07:00
Gabriel
cf499ca047
Update Application.cpp 
Remove the mic bar for android
 2018-05-29 16:42:09 -03:00
NissimHadar
5fb7ec7b72 Updated jsdoc 2018-05-29 11:50:23 -07:00
Stephen Birarda
f7710d126f split up wireshark dissectors for sub protocols 2018-05-29 11:35:03 -07:00
NissimHadar
855084b6d5 Updated jsdoc. 2018-05-29 11:29:59 -07:00
NissimHadar
c49bcbe4e9 Removed "Don't show toolbar in test mode.." as this functionality is available through JS commands. 2018-05-29 11:20:29 -07:00