Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 06:19:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
42986 commits 76 branches 59 tags 1.2 GiB
Commit graph

42986 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
99ffb6b79d Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-03 10:29:41 -07:00
Brad Hefta-Gaub
eb209c7483 Merge pull request #7752 from Geenz/master 
Correction To sRGB Conversions
 2016-05-03 08:01:51 -07:00
Brad Hefta-Gaub
ad285ff9a1 Merge pull request #7769 from ZappoMan/abortForInfiniteLoops 
add support to abort evaluation of long running scripts on shutdown
 2016-05-02 20:44:12 -07:00
Brad Hefta-Gaub
2b54813075 Merge pull request #7783 from zzmp/fix/script-engine-deletion 
Fix script engine deletion
 2016-05-02 18:16:07 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -07:00
Brad Hefta-Gaub
530a06f5f5 Merge pull request #7802 from sethalves/ignore-my-own-actions-on-net 
keep track of actions we are editing and ignore updates from server for these actions
 2016-05-02 17:58:49 -07:00
Seth Alves
1da041de9b don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity 2016-05-02 15:09:08 -07:00
Brad Hefta-Gaub
b98419e537 add units to debug message 2016-05-02 14:58:38 -07:00
Seth Alves
ae8f502808 keep track of actions we are editing and ignore updates from server for these actions 2016-05-02 14:23:36 -07:00
Brad Hefta-Gaub
4569032314 more CR feedback 2016-05-02 12:44:07 -07:00
Clément Brisset
2ef87557fc Merge pull request #7798 from zzmp/clean/override 
Fix warnings on vanilla XCode compilations
 2016-05-02 10:56:07 -07:00
Brad Hefta-Gaub
cddcac60c1 Merge pull request #7768 from ctrlaltdavid/20891 
Add Interface "Home" bookmark function
 2016-05-02 10:14:57 -07:00
Brad Hefta-Gaub
a447ce4633 Merge pull request #7770 from AndrewMeadows/avoid-crosseyes 
don't cross the eyes
 2016-05-02 10:13:25 -07:00
Brad Hefta-Gaub
e117f280cc Merge pull request #7779 from zzmp/fix/fst-crash 
Avoid crashing on missed pipelines
 2016-05-02 10:12:17 -07:00
Brad Hefta-Gaub
44fb572248 Merge pull request #7775 from ctrlaltdavid/20896 
Use UI Toolkit border styles for various dialogs
 2016-05-02 10:11:29 -07:00
Brad Hefta-Gaub
d599d008c3 Merge pull request #7757 from imgntn/cellProduction 
Move cellscience to production s3 bucket
 2016-05-02 10:11:08 -07:00
Zach Pomerantz
29e0744b89 Fix equality in scriptableResource/lib 2016-05-02 09:40:08 -07:00
Seth Alves
01c0b4fbc5 Merge branch 'grab-fixes' of github.com:sethalves/hifi into grab-fixes 2016-05-02 09:32:24 -07:00
Seth Alves
ec554c3c0b Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-01 17:28:20 -07:00
Seth Alves
5b8960e43c send a grab message for action grabs, not just parenting ones 2016-05-01 17:27:50 -07:00
Seth Alves
6591329b0c grab script calls startDistanceGrab and releaseGrab entity methods and sends grab/release messages to Hifi-Object-Manipulation channel 2016-05-01 17:27:44 -07:00
ZappoMan
6026e055aa more CR feedback removed redundant abort code 2016-04-30 15:45:42 -07:00
ZappoMan
00838d1e1e more CR feedback removed redundant abort code 2016-04-30 15:38:37 -07:00
ZappoMan
ee4748fee9 CR Feedback 2016-04-30 15:31:09 -07:00
ZappoMan
73ff0308a9 some CR feedback 2016-04-30 15:23:50 -07:00
Eric Levin
f1de590835 updated script 2016-04-30 14:45:28 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Geenz
043fe3508a Add SRGBA color format. 2016-04-30 15:47:42 -04:00
Geenz
85e0620261 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-30 15:40:28 -04:00
Ryan Huffman
5dadfa9e7e Merge pull request #7792 from Atlante45/fix/crash-asset-request 
Fix dangling reference into container
 2016-04-29 17:58:11 -07:00
Atlante45
6d9080162c Make slots private method 2016-04-29 17:39:53 -07:00
Clément Brisset
ddde4e2dc4 Merge pull request #7793 from imgntn/toyboxProduction 
Move Toybox Domain to Production s3
 2016-04-29 13:27:09 -07:00
Clément Brisset
7c813cdc7b Merge pull request #7795 from imgntn/dicefix 
Fix the dice in /tutorials
 2016-04-29 13:26:45 -07:00
James B. Pollack
fc82780512 move toolbars to production 2016-04-29 11:04:04 -07:00
James B. Pollack
e61f8524c1 update dice path 2016-04-29 11:01:19 -07:00
Brad Hefta-Gaub
d2d4ba277d Merge pull request #7791 from birarda/anon-events 
use a setting handle for UAL disabled to fix startup race
 2016-04-28 19:11:09 -07:00
James B. Pollack
4fd6647d0b add rave stick entity script 2016-04-28 18:25:09 -07:00
James B. Pollack
45bb91cb0b planky 2016-04-28 18:20:20 -07:00
James B. Pollack
d7d667c99b add utils scripts 2016-04-28 18:17:38 -07:00
Stephen Birarda
09981db834 use a setting handle for UAL disabled to fix startup race 2016-04-28 18:05:06 -07:00
Atlante45
9a7bebaaa2 Fix dangling reference into container 2016-04-28 18:04:04 -07:00
James B. Pollack
f73ef9b4a9 cleanup 2016-04-28 18:03:38 -07:00
James B. Pollack
366d9869e6 convert the rest 2016-04-28 18:03:18 -07:00
Brad Hefta-Gaub
19e069f6ef Merge pull request #7790 from birarda/anon-events 
don't require authentication to send usage data
 2016-04-28 18:01:33 -07:00
James B. Pollack
5e31c5f385 convert flashlight and music player 2016-04-28 17:44:14 -07:00
James B. Pollack
a9c95d8e7c convert flappy avatars 2016-04-28 17:42:33 -07:00
David Rowe
6b8109f164 Fix avatar browser top border height and remove separate "close" button 2016-04-29 12:42:10 +12:00
James B. Pollack
cf2d82d320 convert cat and doll 2016-04-28 17:19:35 -07:00
Stephen Birarda
6883891748 don't require authentication to send user activity 2016-04-28 17:08:40 -07:00
Brad Hefta-Gaub
e92e4e57b1 Merge pull request #7772 from AndrewMeadows/minor-optimizations 
minor cleanup and optimizations around EntityItem::getDimensions()
 2016-04-28 17:04:42 -07:00