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

51249 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
c62108c3c8 Resolve merging conflict 2017-02-09 09:49:59 -08:00
Dante Ruiz
0e83e5da06 minimize diff 2017-02-09 07:13:30 -08:00
Dante Ruiz
580216c3d2 adding tablet-goto.js 2017-02-09 07:13:30 -08:00
Dante Ruiz
6bc685b02a saving work 2017-02-09 07:13:29 -08:00
Dante Ruiz
5c5ace7c7b goto in tablet 2017-02-09 07:13:29 -08:00
Philip Rosedale
c9c04a9afc Merge pull request #9638 from PhilipRosedale/fixRescale 
Fix rescale avatar bug
 2017-02-08 22:09:41 -08:00
Seth Alves
2ec4f118fd Merge pull request #9639 from hyperlogic/feature/tablet-pal 
Ported PAL to tablet
 2017-02-08 21:17:38 -08:00
Seth Alves
908df7ee8a Merge pull request #9637 from thoys/FixHiddenCursorForBrowseAndSaveDialogs 
Fix for hidden cursor while using Export Entities / Import Entities form
 2017-02-08 19:42:33 -08:00
Anthony J. Thibault
e25ad0f332 Fix debug assert in FBXReader. 2017-02-08 18:56:58 -08:00
Anthony J. Thibault
b3a46c3518 Bug fix for TabletProxy::loadQMLSource() 2017-02-08 18:56:16 -08:00
Anthony J. Thibault
c2b832fb9c removed debug prints from pal.js 2017-02-08 18:55:22 -08:00
Brad Hefta-Gaub
41dc498888 add inView simulation stats 2017-02-08 18:32:39 -08:00
Anthony J. Thibault
090f632189 Pal: Moved keyboard tray to be flush with bottom of window. 2017-02-08 18:16:48 -08:00
Philip Rosedale
e94e41698e remove debug 2017-02-08 18:04:55 -08:00
Anthony J. Thibault
7cc3079328 Tightened up margins for the tablet. 2017-02-08 17:58:24 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
samcake
e11d10f5d4 Reparing broken normals and also fixing the ambient lighting bug 2017-02-08 16:56:59 -08:00
Brad Hefta-Gaub
c2171ca08f Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats 
Conflicts:
	libraries/avatars/src/AvatarData.h
 2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub
6c41a25032 more stats 2017-02-08 16:51:00 -08:00
Thijs Wenker
6957ac5f8b Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread 2017-02-09 01:31:07 +01:00
Clément Brisset
f608892e47 Merge pull request #9633 from ZappoMan/betterBots 
Various Bot fixes
 2017-02-08 16:08:43 -08:00
Philip Rosedale
dc957d09d8 remove comment 2017-02-08 15:45:29 -08:00
Brad Hefta-Gaub
b399420190 CR 2017-02-08 15:42:59 -08:00
Philip Rosedale
fe92d38b60 Fixed scaling of self 2017-02-08 15:42:10 -08:00
Brad Hefta-Gaub
357cc052e1 first cut at simulation stats 2017-02-08 15:32:48 -08:00
David Kelly
ff7c9d3546 Working like before 
Single entity script running properly.  Now, need to add the zone
filters and execute them.
 2017-02-08 15:36:16 -07:00
Ryan Huffman
58e3351b25 Update stopwatch to use relative paths to models + sounds 2017-02-08 14:27:06 -08:00
Andrew Meadows
e02810458b clear old avatarEntityData when saving settings 2017-02-08 14:14:48 -08:00
Ryan Huffman
40bd7d9475 Update the stopwatch spawn script to exit when done 2017-02-08 14:10:04 -08:00
Ryan Huffman
bc11bf0a69 Update position and orientation of stopwatch 2017-02-08 14:09:50 -08:00
Brad Hefta-Gaub
07cf87749f Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots 2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
82e4b1c690 only recordings with audio 2017-02-08 13:41:20 -08:00
Brad Hefta-Gaub
9d3c674271 fix warning 2017-02-08 13:41:09 -08:00
Brad Hefta-Gaub
202e430adb added 4 more recordings to the script 2017-02-08 13:38:55 -08:00
Ryan Huffman
f75eceda65 Add entity PPS per script configuration 2017-02-08 13:11:18 -08:00
Brad Hefta-Gaub
89368afd68 add back accidentally removed line 2017-02-08 12:52:17 -08:00
Brad Hefta-Gaub
42e9fed64a improved version of random recording bot script 2017-02-08 12:36:13 -08:00
Brad Hefta-Gaub
eedfc4fd38 fix various bot related bugs 2017-02-08 12:35:00 -08:00
samcake
363db8a834 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-08 11:52:18 -08:00
Andrew Meadows
cc301d1c1a remove legacy empty avatarEntityData settings 2017-02-08 11:50:15 -08:00
Andrew Meadows
a871613f84 make Settings::remove() work for groups 2017-02-08 11:49:40 -08:00
samcake
267d553c26 Cleaning comments and pixel format assignments 2017-02-08 11:42:23 -08:00
samcake
9e95944195 clean the usage of glCopyImageSubData and provide a fall back for 4.2) 2017-02-08 11:36:34 -08:00
samcake
8a40e951ac clean the usage of glCopyImageSubData and provide a fall back for 4.2) 2017-02-08 11:35:50 -08:00
samcake
a137659a35 Cleaning up pr for simpler merge 2017-02-08 11:13:55 -08:00
Clément Brisset
91bfa65fe2 Merge pull request #9586 from Triplelexx/21146 
21146
 2017-02-08 11:07:27 -08:00
Dante Ruiz
7db86204d1 general function to load QML for javascript for tablet 
(cherry picked from commit b50e20c545)
 2017-02-08 10:25:11 -08:00
David Kelly
c08adc9faa and the new filter class 2017-02-08 10:51:28 -07:00
David Kelly
4821180dd3 Just add a pointer to the filter class 
but do nothing with it
 2017-02-08 10:48:26 -07:00
David Kelly
61e558e568 Entity Edit Filters for zones 
Part 1 - just put them in the zones entities.  Next I'll hook them
up and actually filter...
 2017-02-08 09:53:25 -07:00