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

42997 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
0f6162d683 Use appropriate units for timing tests 2016-05-04 13:23:10 -07:00
Brad Hefta-Gaub
42169ddcb3 Merge pull request #7806 from Atlante45/fix/warnings 
Fix couple OSX warnings
 2016-05-03 15:42:47 -07:00
Brad Hefta-Gaub
d2889dbda4 Merge pull request #7804 from imgntn/diceFix2 
Move Dice GUI
 2016-05-03 13:05:46 -07:00
Brad Hefta-Gaub
bbf358f81d Merge pull request #7796 from samcake/blue 
Improve Translucent shapes global lighting with support for the ambient map reflection
 2016-05-03 11:14:06 -07:00
Brad Hefta-Gaub
754ef071eb Merge pull request #7786 from sethalves/web-scripts-use-local-libs 
allow scripts on the web to refer to local libraries with /~/
 2016-05-03 11:10:48 -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
Atlante45
eb21b9c5d7 OSX warnings 2016-05-02 17:18:57 -07:00
James B. Pollack
a9ab531e27 clear up toolbar name 2016-05-02 17:01:44 -07:00
James B. Pollack
e971da7dcb move dice GUI 2016-05-02 16:54:32 -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
samcake
a5b32b59a7 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-05-02 09:54:54 -07:00
Zach Pomerantz
29e0744b89 Fix equality in scriptableResource/lib 2016-05-02 09:40:08 -07:00
Seth Alves
a9897f1cc4 Merge branch 'master' of github.com:highfidelity/hifi into web-scripts-use-local-libs 2016-05-02 07:25:42 -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
Seth Alves
351a5d2cb1 remove debug print 2016-04-29 13:24:12 -07:00
Seth Alves
b28cfd27ec fix problem where canonicalFilePath will strip a trailing slash 2016-04-29 13:17:59 -07:00
Seth Alves
36e84e6266 Merge branch 'master' of github.com:highfidelity/hifi into web-scripts-use-local-libs 2016-04-29 11:04:23 -07:00
Seth Alves
f03130ff5a more work toward keeping /~/../.. from working 2016-04-29 11:04:08 -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
samcake
52c403e980 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-04-29 10:59:23 -07:00
samcake
257c8c94c3 clean up the lighting function and put the global specular lighting in a separate function 2016-04-29 10:58:55 -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
Seth Alves
ced18fe6be trying some more to get /~/ to work right 2016-04-28 18:29:54 -07:00
Seth Alves
8c2b89b910 trying to get /~/ from web sorted out 2016-04-28 18:29:46 -07:00
Seth Alves
82b43dbfec Merge branch 'master' of github.com:highfidelity/hifi into web-scripts-use-local-libs 2016-04-28 18:29:40 -07:00