Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22485 commits 75 branches 59 tags 1.2 GiB
Commit graph

7330 commits

Author SHA1 Message Date
Stephen Birarda
43e777163e use a QPointer to trigger delayed delete 2015-02-11 19:15:33 -08:00
Stephen Birarda
79674fb94f use a wrapper on audio injector for script ownership 2015-02-11 17:20:00 -08:00
Stephen Birarda
449719bc7c add option to restart a local audio injector 2015-02-11 16:58:30 -08:00
Stephen Birarda
f9174366dc fixes for new injector API in other scripts 2015-02-11 16:20:48 -08:00
Stephen Birarda
4894a5b414 better handling of cleanup for local injector 2015-02-11 16:11:55 -08:00
Stephen Birarda
0498c5c708 provide old ASI APIs in AudioInjector 2015-02-11 15:57:32 -08:00
Stephen Birarda
7b485829c4 cleanup AudioInjector memory management 2015-02-11 15:52:00 -08:00
ZappoMan
7a45b1bc96 fix the quad color being broken after rendering text 2015-02-11 15:50:04 -08:00
Andrew Meadows
9f59addbc2 merge upstream/master into andrew/thermonuclear 2015-02-11 13:35:28 -08:00
Andrew Meadows
8b34283d76 fix missing comma 2015-02-11 13:21:57 -08:00
Ryan Huffman
341e31a074 Remove extraneous initialized check 2015-02-11 13:08:11 -08:00
Andrew Meadows
4581802532 explicitly flag virtual functions as such 2015-02-11 13:03:22 -08:00
Andrew Meadows
bd1817817b restore order of PROP_USER_DATA 2015-02-11 12:59:59 -08:00
Ryan Huffman
51ff897ee5 Update Font to not setup GL until first draw 2015-02-11 12:59:12 -08:00
Brad Hefta-Gaub
9a7ed8055f Merge pull request #4267 from samcake/master 
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
 2015-02-11 09:45:29 -08:00
Andrew Meadows
5975380892 Merge pull request #4266 from ZappoMan/bugfix 
fix color issues with quads
 2015-02-11 09:03:10 -08:00
Andrew Meadows
68c1e9ef71 Merge pull request #4260 from birarda/master 
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
 2015-02-11 09:02:18 -08:00
Andrew Meadows
d9b57de649 merge upstream/master into andrew/thermonuclear 2015-02-11 08:56:34 -08:00
Andrew Meadows
b983f6fccf bump entity packet version 2015-02-11 08:52:49 -08:00
Andrew Meadows
ff27ab74ae expose _shapeType to script and server 2015-02-11 08:46:41 -08:00
Andrew Meadows
d89548312e manipulate the extents for SHAPE_TYPE_SPHERE 
The conversion from ShapeInfo to btShape MUST be reversable!
Otherwise we leak shapes in the ShapeManager class.
 2015-02-11 08:44:10 -08:00
Andrew Meadows
f4a4c9786c don't create shape for SHAPE_TYPE_NONE 2015-02-11 08:43:55 -08:00
Andrew Meadows
3239c259f9 remove commented out cruft 2015-02-11 08:43:19 -08:00
Andrew Meadows
123d73783b remove warning about unused variable 2015-02-11 08:42:36 -08:00
Sam Gateau
a6f006a36d more cleaning 2015-02-10 18:41:36 -08:00
Sam Gateau
b9fd116dbf Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu 2015-02-10 18:38:48 -08:00
ZappoMan
8016fb5e0d fix color issues with quads 2015-02-10 17:35:27 -08:00
Atlante45
562b289c05 Fix warning 2015-02-10 19:25:38 +01:00
Atlante45
438978b855 Fix reverb memory leak 2015-02-10 19:25:12 +01:00
Stephen Birarda
fe79d8902e replace data with metaverse for highfidelity urls 2015-02-10 10:05:38 -08:00
Atlante45
e79e1a547f Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-02-10 16:08:34 +01:00
Sam Gateau
11beb51ec1 Clean up comments 2015-02-09 18:02:34 -08:00
Sam Gateau
23a54b17ce Clean up comments 2015-02-09 15:33:55 -08:00
Sam Gateau
871f9a849a CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:30:17 -08:00
Sam Gateau
c2761ac887 CLean up the shader code for the blinn and the new PBR shading equation 2015-02-09 15:26:14 -08:00
Stephen Birarda
5f7c4278b8 handle custom domain-server port if it is present 2015-02-09 13:01:38 -08:00
Andrew Meadows
e6a6946027 merge upstream/master into andrew/thermonuclear 2015-02-09 12:44:52 -08:00
Andrew Meadows
12543cae75 initial add of ModelEntityItem::_shapeType 2015-02-09 12:43:56 -08:00
Sam Gateau
559647b7af Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-09 12:26:29 -08:00
Sam Gateau
ace6dc4faf Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-08 23:23:06 -08:00
Sam Gateau
48fca4c11d introducing PBR shading 2015-02-08 23:22:14 -08:00
Brad Davis
b28920f4ed Fixing bug in text renderer causing glyphs to float at different depths 2015-02-08 15:37:55 -08:00
Andrew Meadows
a233551ec3 oops forgot to implement ShapeInfo::setParams() 2015-02-08 15:35:54 -08:00
Andrew Meadows
0ef5d42a5b unit tests support new ShapeInfo API 2015-02-08 15:13:21 -08:00
Andrew Meadows
12a7021bb5 ShapeInfo computs own DoubleHashKey, gets new API 2015-02-08 15:12:44 -08:00
Andrew Meadows
13b00f3f8f forgot to add SphereEntityItem.cpp to last commit 2015-02-08 15:10:16 -08:00
Andrew Meadows
450713fdaa Entitis support new (pending) API for ShapeInfo 2015-02-08 15:08:50 -08:00
Brad Hefta-Gaub
12ab841191 Merge pull request #4248 from samcake/temp0 
Remove unneeded texture memory once loaded to GPU and Lightmap control in FBX
 2015-02-06 16:52:40 -08:00
Sam Gateau
469ee29f0b Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2015-02-06 16:30:47 -08:00
Sam Gateau
bdf9164c7b debugging the new global light pass 2015-02-06 16:30:07 -08:00
Sam Gateau
d4566bb1d7 Adding support for hifi_global light intensity & COlor and use it to adjust the lighmap parameters 2015-02-06 15:51:57 -08:00
Stephen Birarda
caf50764b4 correct resource name for Q_INIT_RESOURCE 2015-02-06 15:27:50 -08:00
Stephen Birarda
961b5b5346 call Q_INIT_RESOURCE statically from Font constructor 2015-02-06 15:17:53 -08:00
Stephen Birarda
d68b0958a7 resolve conflicts on merge with upstream/master 2015-02-06 14:09:20 -08:00
Brad Hefta-Gaub
390d2be48f Merge pull request #4189 from birarda/android 
add the gvr-interface target for GearVR
 2015-02-06 14:07:28 -08:00
Stephen Birarda
9a98e07b2d call Q_INIT_RESOURCE from mains to handle static link 2015-02-06 12:39:14 -08:00
Sam Gateau
e9add29af1 texture memory 2015-02-06 12:17:51 -08:00
Stephen Birarda
7b5af1e3fd cleanup debug for font load 2015-02-06 12:06:20 -08:00
Stephen Birarda
27b91e7d43 use QIODevice for loadFont method 2015-02-06 12:04:57 -08:00
Brad Hefta-Gaub
c90c0b53c3 Merge pull request #4242 from huffman/fix-ac-entity-viewer 
Fix ac entity viewer
 2015-02-06 12:01:13 -08:00
Stephen Birarda
f32556d64a Merge branch 'master' of https://github.com/highfidelity/hifi into binary-fonts 2015-02-06 11:50:38 -08:00
Brad Hefta-Gaub
79b397fc3f Merge pull request #4241 from birarda/master 
repairs for warnings exposed in Xcode
 2015-02-06 11:49:29 -08:00
Stephen Birarda
c8fb891158 move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
Ryan Huffman
4a3ee02b11 Initialize _entityScriptingInterface in ScriptEngine 2015-02-06 11:31:19 -08:00
Stephen Birarda
58d5e0b9d3 fix some asterisk type squishes in TextRenderer 2015-02-06 10:48:10 -08:00
Seth Alves
9539292c22 clarify settings explaination, coding standard 2015-02-06 10:44:35 -08:00
Stephen Birarda
c96085eb91 repairs to warnings shown in Xcode 2015-02-06 10:12:04 -08:00
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
Seth Alves
839b622a05 formatting 2015-02-06 09:20:16 -08:00
Seth Alves
6d5d6b9085 Merge branch 'master' of github.com:highfidelity/hifi into allowed-editors 2015-02-06 09:15:41 -08:00
Seth Alves
60a4f48985 rather than a list of allowed editors, a list of allowed lockers/unlockers 2015-02-06 09:14:40 -08:00
Brad Hefta-Gaub
f8d62d332a Merge pull request #4222 from jherico/text-renderer 
Text renderer refactor to use signed distance field font rendering
 2015-02-05 21:58:41 -08:00
Brad Davis
39794a7a40 Getting rid of some warnings 2015-02-05 21:00:34 -08:00
Sam Gateau
1b22a3ef36 connecting the globalLight info to the DeferredLightingEffect 2015-02-05 17:30:57 -08:00
Seth Alves
46bf6ea5da coding standard 2015-02-05 16:37:37 -08:00
Seth Alves
bad44c540a also guard deleteEntity and getEntityProperties with canEdit. make canEdit available to javascript 2015-02-05 16:22:52 -08:00
Seth Alves
80cf571d7d formatting 2015-02-05 15:43:27 -08:00
Seth Alves
485785be7f Allowed Editors setting in DomainServer; domain-list wire protocol includes "you can edit" boolean after uuid; entity server checks canEdit flag of node who sends edit requests; interface does not attempt to do edits if DomainServer sent false for "you can edit" 2015-02-05 15:37:14 -08:00
Sam Gateau
925449721a Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-05 14:10:40 -08:00
Sam Gateau
9b0036d010 adding Light and replace glLights also for the first deferred pass 2015-02-05 14:10:06 -08:00
Brad Davis
dc1cc84c1c Working on porting to mac compatible shaders 2015-02-05 12:58:09 -08:00
Brad Hefta-Gaub
d76ede624c Merge pull request #4234 from AndrewMeadows/bispinor 
fix physics crash on disconnect from domain-server
 2015-02-05 11:36:02 -08:00
Sam Gateau
dd0d45cdc5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-05 10:21:12 -08:00
Sam Gateau
00a9f55bc3 lightings seems to work correctly now 2015-02-05 10:20:19 -08:00
Andrew Meadows
b4da2ddd52 fix physics crash on disconnect from domainserver 2015-02-05 09:13:32 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Brad Davis
e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer 2015-02-04 21:04:47 -08:00
Sam Gateau
8e1eebbbd4 FInally getting the angular attenuation 2015-02-04 17:24:23 -08:00
Clément Brisset
6a4577b6a5 Merge pull request #4231 from ZappoMan/crashonexit 
BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics
 2015-02-04 16:16:56 -08:00
Brad Hefta-Gaub
af91eee5a0 Merge pull request #4220 from sethalves/rework-bandwidth-meter 
fix several signed/unsigned comps, avoid sprintf in overlay code
 2015-02-04 16:06:22 -08:00
Stephen Birarda
93a3158153 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-02-04 15:16:23 -08:00
ZappoMan
8fd11e70cc clamp dt for skipTimeForward to prevent near infinite loops 2015-02-04 15:16:18 -08:00
Stephen Birarda
c9c53453c3 repairs to local audio injector cleanup 2015-02-04 14:47:18 -08:00
Brad Davis
02f2f1c1bf Fixing header order and code style 2015-02-04 14:36:03 -08:00
Brad Hefta-Gaub
97f888b340 Merge pull request #4227 from huffman/internal-delete-fix 
Add force delete to internal EntityTree deletes
 2015-02-04 14:02:34 -08:00
Sam Gateau
6c00f29f2b REvisiting the shaders for lighting on deferred pass 2015-02-04 14:01:16 -08:00
ZappoMan
698fcd8116 fix crash on shutdown 2015-02-04 13:54:14 -08:00
Sam Gateau
3c30e70c12 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-04 13:32:02 -08:00
Sam Gateau
7d6161598b REvisiting the shaders for lighting on deferred pass 2015-02-04 13:31:39 -08:00
ZappoMan
4061e14c2d move static members of ResourceManager into DependencyManager 2015-02-04 13:24:37 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Philip Rosedale
fe3f01be7e Merge pull request #4225 from ZappoMan/memleak 
actually delete resources... even on windows
 2015-02-04 11:57:54 -08:00
Stephen Birarda
9461d5d8d1 drop samples from ring buffer if muted 2015-02-04 11:47:53 -08:00
Seth Alves
bcf0846310 merge from master 2015-02-04 11:30:22 -08:00
Brad Davis
ba277e802a Working on OSX compilability 2015-02-04 11:29:31 -08:00
Seth Alves
a645d784d8 uint32_t rather than uint, which mac doesn't like 2015-02-04 11:26:05 -08:00
Stephen Birarda
e47333a808 specify QScriptable include under QtScript 2015-02-04 11:08:26 -08:00
Stephen Birarda
30afadc7b7 fixes for new settings API 2015-02-04 10:53:05 -08:00
Ryan Huffman
2b00e3fadc Add force option to deleteEntity 2015-02-04 10:49:49 -08:00
ZappoMan
ded035094a actually delete resources... even on windows 2015-02-04 10:45:04 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Stephen Birarda
a2002d169f fix for exception handled lookup in LimitedNodeList 2015-02-04 10:27:33 -08:00
Brad Davis
0dcf5b001f Some more cleanup 2015-02-03 23:26:15 -08:00
Brad Davis
f471597a73 Merge branch 'develop' into text-renderer 2015-02-03 23:07:19 -08:00
Brad Davis
d34c2ae26a Merge branch 'master' into develop 2015-02-03 23:06:49 -08:00
Brad Davis
cb7f4ca672 Pre-pull checking 2015-02-03 23:06:09 -08:00
Brad Davis
53b0fd409d Tweaking text scaling value to more closely match old text renderer 2015-02-03 22:30:39 -08:00
Brad Davis
1af2b65714 Fixing scaling to lineHeight 2015-02-03 22:21:32 -08:00
Brad Davis
77ce737f61 Working on porting renderable text item to new code 2015-02-03 22:11:24 -08:00
Brad Davis
9a6175a3b9 Starting to work on replacement for clip planes 2015-02-03 22:10:44 -08:00
Brad Hefta-Gaub
de58c4a007 Merge pull request #4217 from Atlante45/master 
Fix for fps bug/field of view
 2015-02-03 19:13:52 -08:00
Brad Hefta-Gaub
01f594b535 Merge pull request #4221 from AndrewMeadows/bispinor 
proof Andrew has a working Windows build on his laptop
 2015-02-03 19:07:01 -08:00
Brad Davis
0c78af9abb Working on text rendering refactor 2015-02-03 18:57:39 -08:00
Atlante45
fc4bf0c325 Don't check gl errors 2015-02-03 18:55:52 -08:00
Atlante45
7a03daa76f Inline setFieldOfView 2015-02-03 18:51:26 -08:00
Brad Hefta-Gaub
79b04afaf8 Merge pull request #4210 from ctrlaltdavid/20280 
CR for Job #20280 - Warn if Interface and Stack have incompatible build level
 2015-02-03 18:51:17 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
Brad Davis
190669d168 Merge branch 'master' into develop 2015-02-03 18:43:51 -08:00
Brad Davis
cab31e7190 Working on text coordinates 2015-02-03 18:43:24 -08:00
Andrew Meadows
547a416c3b merge upstream/master into andrew/bispinor 2015-02-03 18:33:10 -08:00
Sam Gateau
1029af140e tiny bit different... 2015-02-03 18:15:20 -08:00
Seth Alves
450787fde2 Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter 2015-02-03 17:33:27 -08:00
Sam Gateau
6ad484e13f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-03 17:26:27 -08:00
Sam Gateau
e502105ad7 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-03 17:16:48 -08:00
Atlante45
e4591e0d03 Work arount for QVariant not converting to QVariant 2015-02-03 17:11:32 -08:00
Seth Alves
8489ee04f3 fix a couple of signed vs unsigned comparisons. 2015-02-03 16:11:04 -08:00
Sam Gateau
5719e277dd FIx the lightmap not displaying when using the texcoord0 2015-02-03 16:10:31 -08:00
Stephen Birarda
dc84c336ea handle login failure, have AccountManager generate keypair 2015-02-03 16:09:06 -08:00
Stephen Birarda
64fda3253e add a LoginDialog and pass credentials to AccountManager 2015-02-03 15:53:07 -08:00
David Rowe
d9e353e498 Merge branch 'master' into 20280 
Conflicts:
	libraries/networking/src/LimitedNodeList.h
 2015-02-03 14:46:27 -08:00
Sam Gateau
d8d0a28d0f FInd a solution for lightmap without 2nd uvset 2015-02-03 14:34:11 -08:00
Atlante45
78a9d002db Remove settings from InboundAudioStream 2015-02-03 12:47:25 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Atlante45
aacf61609f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-03 10:53:44 -08:00
Seth Alves
d2c70936e3 coding standard, remove unneeded asserts 2015-02-03 10:51:35 -08:00
Sam Gateau
280b41c23a Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-03 10:43:48 -08:00
Stephen Birarda
e07ce23825 resolve conflicts on merge with upstream master 2015-02-03 10:25:17 -08:00
Andrew Meadows
90202591fc remove legacy shapes from EntityItem and friends 2015-02-03 10:05:39 -08:00
Andrew Meadows
28a3c3f469 separate new shape types from legacy 2015-02-03 08:34:06 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
Brad Davis
68448daa18 Moving closer to the original coordinate system 2015-02-02 23:29:46 -08:00
Brad Davis
8d81607e28 Tweaking the example text renderer 2015-02-02 23:27:57 -08:00
Atlante45
5388ed1c4a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-02 18:38:09 -08:00
Atlante45
f0b5cd195d Renaming + end of file spaces 2015-02-02 18:37:49 -08:00
Sam Gateau
5c4a8a5cda Fixing the spotlight 2015-02-02 17:24:26 -08:00
Atlante45
9abdb41764 Rearrange settings classes in correct files 2015-02-02 17:17:19 -08:00
Stephen Birarda
28d710877c remove application calls from audio-client 2015-02-02 17:13:08 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Andrew Meadows
0b78156956 remove unnecessary #includes 2015-02-02 16:45:51 -08:00
Andrew Meadows
156c4fcc9f removing legacy collision detection code in Octree 2015-02-02 16:42:05 -08:00
Sam Gateau
16f12dd267 working on the point light shader edge representation 2015-02-02 16:31:36 -08:00
Atlante45
633ec9807d New settings api 2015-02-02 15:56:03 -08:00
Seth Alves
38162380ad coding standard 2015-02-02 15:37:28 -08:00
Seth Alves
82b8595af8 coding standard 2015-02-02 15:34:08 -08:00
Seth Alves
c1ae98fa1a quiet some compiler warnings about signed vs unsigned comparisons 2015-02-02 15:02:29 -08:00
Seth Alves
e779a55e22 remove stray debugging line 2015-02-02 12:30:11 -08:00
Seth Alves
4377105410 formatting and cleanups 2015-02-02 12:13:54 -08:00
Seth Alves
779a0086c4 BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second 2015-02-02 11:56:50 -08:00
Sam Gateau
2eb3c92e1d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-02 11:19:08 -08:00
Sam Gateau
0da38c103f working on the spot light shader 2015-02-02 11:17:35 -08:00
Seth Alves
f1cca2ac92 move bandwidth stats display details out of recorder class into dialog class 2015-02-02 09:26:09 -08:00
Seth Alves
c0a219678c use DependencyManager to keep track of BandwidthRecorder 2015-02-02 08:55:55 -08:00
Seth Alves
b85456b1e9 refactoring, cause BandwidthDialog to only update numbers once per second 2015-02-02 05:28:28 -08:00
Brad Davis
ab1624b0a8 Adding matrix stack (currently not used 2015-02-01 16:25:17 -08:00
Brad Davis
711506e055 Moving implementation details out of header 2015-02-01 14:15:34 -08:00
Brad Davis
60317b3526 Working on signed distance fields text rendering 2015-01-31 21:42:54 -08:00
Seth Alves
fc07ecf83d use BandwidthRecorder rather than recompute Mbps and pps in Application 2015-01-31 20:40:18 -08:00
Seth Alves
bee895ba0a capture network bandwidth stats from NodeList rather than various places 2015-01-31 20:02:04 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
3c7cdc16ce Merge branch 'master' into 20280 
Conflicts:
	interface/src/Application.h
 2015-01-30 18:44:14 -08:00
Brad Hefta-Gaub
2eeb2a5ec5 Merge pull request #4205 from AndrewMeadows/isentropic 
small models get box collision shape
 2015-01-30 18:30:55 -08:00
Andrew Meadows
a723c748f5 check initialization of _needsInitialSimulation 2015-01-30 18:08:00 -08:00
Sam Gateau
56925cee00 Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-01-30 17:04:27 -08:00
Sam Gateau
c3e1311ed1 avoid recreating lights every frame, just have a pool of lights edited each frames 2015-01-30 17:03:28 -08:00
dev
6eca52e4f2 point light is working with Mac 2015-01-30 17:01:46 -08:00
Andrew Meadows
9da6b623a3 move shape polymorphism to ModelEntityItem 2015-01-30 16:25:35 -08:00
Andrew Meadows
bc52ba1d29 restore polymorphism for Box and Sphere entities 2015-01-30 16:18:50 -08:00
David Rowe
729fbbf5ac A further custom User-Agent string 2015-01-30 15:56:01 -08:00
Andrew Meadows
80f6f718d0 EntityItem base class now computes shapeInfo 2015-01-30 14:17:29 -08:00
Andrew Meadows
b035c5b082 fix for updating moving models 2015-01-30 14:16:32 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Atlante45
0cc4f5b226 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-30 13:30:17 -08:00
Sam Gateau
38129c2988 Merging with latest build 2015-01-30 12:58:50 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/avatar/Hand.cpp
 2015-01-30 12:02:11 -08:00
Atlante45
19ea9724ab Re-add accidentally removed int size() 2015-01-30 11:41:14 -08:00
Sam Gateau
228e629856 working on the spot light now 2015-01-30 11:40:44 -08:00
samcake
e3fa2e1995 Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval 
Removal of glColorXXX()
 2015-01-30 10:21:18 -08:00
Sam Gateau
19047f000a Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-30 10:20:55 -08:00
Stephen Birarda
3af97b7f8d show GVRInterface in full screen on Android 2015-01-30 10:16:48 -08:00
samcake
331104d1c6 Merge pull request #4194 from thoys/texture-max-area-2M 
changing texture size limit from 1024*1024 to 2M  i.e. (1024 * 2048).
 2015-01-29 17:33:35 -08:00