Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49007 commits 71 branches 56 tags 1.2 GiB
Commit graph

49007 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
31decffb31 clean up 2 2016-12-20 15:59:52 +00:00
Dante Ruiz
7251fa6c18 clean up 2016-12-20 15:54:14 +00:00
Dante Ruiz
74092d8714 removed commented code 2016-12-20 15:46:15 +00:00
Dante Ruiz
fc4b4f85f4 added button to menu 2016-12-20 00:24:45 +00:00
Dante Ruiz
c0e82d3e05 moving buttons to tablet 2016-12-19 13:43:49 -08:00
Faye Li
c4d1bee0e3 Merge pull request #9232 from hyperlogic/tablet-ui 
Fixed js interface after recent Tablet.qml changes
 2016-12-19 13:29:40 -08:00
Anthony J. Thibault
10f9233c90 Fixed js interface after recent Tablet.qml changes 
* TabletButton.inDebugMode defaults to false
* TabletButton now listens to onIsActiveChanged event to flip state of button.
* Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property
 2016-12-19 12:20:56 -08:00
Anthony Thibault
f808c0232f Merge pull request #9224 from fayeli/friday 
Tablet Main Screen QML Iteration 2
 2016-12-19 11:45:24 -08:00
Faye Li Si Fi
edd1a02aa1 added debug mode 2016-12-19 09:19:36 -08:00
Faye Li Si Fi
434e7dfbbd reduce testing buttons number to 6 2016-12-19 09:13:12 -08:00
Faye Li Si Fi
01c5c2745d remove commented out code, added uuid property 2016-12-16 16:29:02 -08:00
Anthony Thibault
c84a88bd6b Merge pull request #9220 from druiz17/tablet 
fixed home button issues
 2016-12-16 14:28:46 -08:00
Dante Ruiz
61e2fb2366 correct indentation for HomeButton.js 2016-12-16 21:51:01 +00:00
Dante Ruiz
8f36090884 removed tabs and also remove script from host 2016-12-16 21:45:53 +00:00
Faye Li Si Fi
4d98f6979c hover state glow 2016-12-16 13:43:47 -08:00
Faye Li Si Fi
5200dd9581 New color scheme and button state styling 2016-12-16 11:50:04 -08:00
Anthony Thibault
c6d7894f52 Merge pull request #9219 from hyperlogic/tablet-ui 
Can now remove and edit buttons on the Tablet
 2016-12-16 10:46:05 -08:00
Dante Ruiz
f7df9a64b2 remmoved tabs 2016-12-16 18:32:05 +00:00
Dante Ruiz
cb4b2473e1 remmoved tabs as whitespace 2016-12-16 18:30:15 +00:00
Anthony J. Thibault
3610beb2cd bug-fix found in code review 2016-12-16 09:57:12 -08:00
Dante Ruiz
a0a8ecc158 even more clean up 2016-12-16 17:28:02 +00:00
Dante Ruiz
f2d9f34993 more clean up 2016-12-16 17:25:38 +00:00
Dante Ruiz
889e9e854c clean up 2016-12-16 17:24:53 +00:00
Dante Ruiz
40a79867be removed unnessary comments 2016-12-16 17:24:09 +00:00
Dante Ruiz
571783b90d fixed home buttons issues 2016-12-16 09:19:22 -08:00
Anthony J. Thibault
5441d33a25 Support for the ablity to change button properties from js. 2016-12-15 18:17:14 -08:00
Anthony J. Thibault
0add5274ac Add tabletTest.js to test adding and removing buttons from tablet UI 2016-12-15 16:50:20 -08:00
Anthony J. Thibault
5d1ccfbccc Tablet#removeButton now works properly 2016-12-15 15:49:37 -08:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
Brad Hefta-Gaub
0923a79139 Merge pull request #9187 from PhilipRosedale/rescale 
Rescale yourself or entities using the grip buttons
 2016-12-15 12:32:04 -08:00
Brad Hefta-Gaub
25c6e8021f Merge pull request #9198 from zzmp/chmod/render-utils 
Change file permissions of source code to remove execute bits
 2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty 
Forward render task (empty and only used with RENDER_FORWARD set)
 2016-12-15 09:57:18 -08:00
Seth Alves
cbb88601d9 Merge pull request #9215 from hyperlogic/tablet-ui 
TabletScriptingInterface and Help button now on tablet.
 2016-12-15 07:03:53 -08:00
Seth Alves
4494edae33 Merge pull request #9210 from zfox23/FB_2591 
FB 2591: Taking simultaneous GIF snapshots crashes Interface
 2016-12-15 07:01:58 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
Seth Alves
b11bfd405d Merge pull request #9216 from birarda/min-cores-comment 
fix a confusing comment about min cores required
 2016-12-15 06:55:26 -08:00
Stephen Birarda
4c1f99954b fix confusing MIN_CORES_SPEC comment 2016-12-14 17:49:08 -08:00
Stephen Birarda
6c344b0c75 Merge pull request #9211 from Atlante45/disable_steamworks 
Make Steam client calls into a plugin
 2016-12-14 17:35:51 -08:00
Anthony J. Thibault
d2c4417b24 Hook up Help button to the new Tablet interface 2016-12-14 17:05:47 -08:00
Atlante45
588fdd6efa Add steamworks to interface externals 2016-12-14 16:07:33 -08:00
Atlante45
bfc789f072 CR - CLI text 2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
Anthony J. Thibault
d4f9d21ce8 Pass tablet QQuickItem to TabletScriptingInterface 
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
 2016-12-14 14:04:48 -08:00
Philip Rosedale
14c867fdbd Can't resize if objects in both hands, avatar resize is seek + grips 2016-12-14 13:38:37 -08:00
Andrew Meadows
c1e283fa6d Merge pull request #9201 from samcake/red 
Fix local light shading tiling issue
 2016-12-14 12:25:02 -08:00
Zach Fox
c53111781b Fix the bug 2016-12-14 12:17:00 -08:00
Anthony J. Thibault
db0b2ba7d3 Fleshing out TabletScriptingInterface. 
Added TabletProxy and TabletButtonProxy
 2016-12-14 12:08:41 -08:00
Anthony J. Thibault
d94da76b72 Added TabletScriptingInterface 2016-12-14 12:08:40 -08:00
Anthony Thibault
9928565ccf Merge pull request #9203 from fayeli/qml-tuesday 
Tablet Main Screen UI Prototype
 2016-12-14 12:06:57 -08:00
Faye Li Si Fi
a651e19bdd audio gradient bar length as a function of 0 to 1 2016-12-14 11:38:36 -08:00