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

50436 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
204652514e fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
Seth Alves
ad5c3f0b44 Merge pull request #9513 from sethalves/tablet-ui 
Tablet ui
 2017-01-25 15:58:29 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Seth Alves
bbe3f11fd7 Merge pull request #9506 from sethalves/tablet-ui-HUD-ui 
provide a way to switch mostly back to HUD-based ui
 2017-01-25 15:49:16 -08:00
Seth Alves
f382b541c7 merge from upstream 2017-01-25 15:42:33 -08:00
Seth Alves
888d326783 Merge pull request #9509 from druiz17/tabletBug 
removed more qml errors
 2017-01-25 15:41:07 -08:00
Seth Alves
10ecc271cf Merge pull request #9512 from fayeli/users-icon 
Tablet Button Improvements
 2017-01-25 15:40:42 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Stephen Birarda
42083a1a6d Merge pull request #9457 from Atlante45/entity-script-server 
Entity script server
 2017-01-25 15:37:27 -08:00
Faye Li
6f46136699 reorder buttons to match mockup 2017-01-25 15:02:55 -08:00
Faye Li
49a8964c4e reference new users icon art 2017-01-25 14:43:39 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Dante Ruiz
6671d7f9e6 removed some unnessary menu item 2017-01-25 21:23:04 +00:00
Clément Brisset
3f34a9e832 Merge pull request #40 from birarda/entity-script-server 
hack to accept possibly newer server scripts
 2017-01-25 13:21:45 -08:00
Stephen Birarda
11005bdc55 Merge pull request #41 from Atlante45/ess-pr 
Merge branch 'master' of https://github.com/highfidelity/hifi into es…
 2017-01-25 13:14:03 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Ryan Downe Karpf
b053fb55aa Merge pull request #9478 from birarda/bug/too-many-casts 
some reinterpret/dynamic cast cleanup in domain-server
 2017-01-25 12:47:27 -08:00
Stephen Birarda
304618f51d cleanup comment and scoping for server script URL changes 2017-01-25 12:39:41 -08:00
Stephen Birarda
f1b4f79ad9 a simple hack to accept newer server scripts 2017-01-25 12:39:41 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Dante Ruiz
0d7f15e41b removed more qml errors 2017-01-25 18:22:28 +00:00
Seth Alves
11d01a0c00 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-HUD-ui 2017-01-25 09:42:59 -08:00
Ryan Huffman
f165e364e2 Merge pull request #39 from huffman/entity-script-server 
Remove entity server script status log spam from edit.js
 2017-01-25 09:33:25 -08:00
Ryan Huffman
2bb7a7a4a6 Remove entity server script status log spam from edit.js 2017-01-25 09:32:25 -08:00
Seth Alves
7d370fb791 Merge pull request #9507 from cozza13/tablet-ui 
Changes to tablet formatting
 2017-01-25 09:29:16 -08:00
Seth Alves
4c8e90533b Merge pull request #9508 from druiz17/tabletBug 
fixed tablet bug when reloading scripts
 2017-01-25 09:28:50 -08:00
Dante Ruiz
c811839163 tablet is not selectable in edit mode 2017-01-25 16:46:17 +00:00
Ryan Huffman
d607e74d3c Merge pull request #9501 from Atlante45/fix/steam-api 
Fix Steam scripting interface calls
 2017-01-25 08:21:02 -08:00
Dante Ruiz
bc75cf5bed removed tabs 2017-01-25 16:11:37 +00:00
Dante Ruiz
bda8b65e79 fixing spaceing 2017-01-25 16:06:40 +00:00
Dante Ruiz
a147ce3f5f fixed load script issue 2017-01-25 08:00:41 -08:00
Dante Ruiz
096b2e876f removing qml null print error 2017-01-25 08:00:40 -08:00
Chris Collins
df9bfa6eff Changes to tablet formating 
Changes to QML and .js formating to match style of mockup.
 2017-01-25 07:41:04 -08:00
Seth Alves
4335bbe4fe provide a way to switch mostly back to HUD-based ui 2017-01-24 18:48:11 -08:00
Clément Brisset
5cd0af9136 Merge pull request #37 from birarda/entity-script-server 
fix interest list checks, remove unecessary sets
 2017-01-24 18:46:26 -08:00
Stephen Birarda
cd1ddd3a3a Merge pull request #38 from Atlante45/ess-pr 
Fix wrong status when removing script
 2017-01-24 18:44:05 -08:00
Atlante45
9cacde2416 Fix wrong status when removing script 2017-01-24 18:36:27 -08:00
Stephen Birarda
9b8cbba53f add isInInterestSet to DomainServer for extra checks 2017-01-24 18:32:33 -08:00
Stephen Birarda
586c3512a7 remove useless additional includeThisEntity sets 2017-01-24 17:35:45 -08:00
Clément Brisset
4ec5d70e76 Merge pull request #36 from birarda/entity-script-server 
force full send if query changes, don't check inclusion if not updated
 2017-01-24 17:26:30 -08:00
Stephen Birarda
e511b6e84c cleanup connect check in DomainServer 2017-01-24 17:14:05 -08:00
Stephen Birarda
fc42c1bc94 don't tell ESS about script Agents that won't talk to it 2017-01-24 17:10:05 -08:00
Atlante45
b4400af026 Rename Steam.isRunning to Steam.running 2017-01-24 17:06:50 -08:00
Stephen Birarda
69b47dcf50 use currentParameters instead of getJSONParameters() 2017-01-24 16:49:17 -08:00
Stephen Birarda
67a3d97f81 cleanup includeThisEntity check 2017-01-24 16:41:20 -08:00
Stephen Birarda
543d0ce77e add a comment about usesFrustum check in EntityTreeElement 2017-01-24 16:36:44 -08:00
Stephen Birarda
33378ede5c force full scene send if json parameters changed 2017-01-24 16:34:57 -08:00
Atlante45
808d336fe6 Protect again empty plugin 2017-01-24 16:17:49 -08:00
Atlante45
b4d3a2b79f Fix member not being set 2017-01-24 16:13:28 -08:00
Seth Alves
d605ad0253 Merge pull request #9500 from sethalves/tablet-ui-close-tablet-upon-goto 
Tablet ui close tablet upon goto
 2017-01-24 16:05:24 -08:00