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 |
|
ZappoMan
|
66567fd89d
|
CR feedback
|
2015-01-29 17:24:56 -08:00 |
|
ZappoMan
|
c1bb03e9a8
|
CR feedback
|
2015-01-29 17:23:48 -08:00 |
|
Thijs Wenker
|
ff29b1c8cc
|
style/conversion fixes
|
2015-01-30 02:18:51 +01:00 |
|
Sam Gateau
|
264435b695
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-01-29 17:14:11 -08:00 |
|
Sam Gateau
|
976239d433
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-01-29 17:12:32 -08:00 |
|
Sam Gateau
|
471da3935d
|
working on the lighting
|
2015-01-29 17:11:50 -08:00 |
|
Thijs Wenker
|
a4c82072a2
|
changing texture size limit from 1024*1024 to 2M i.e. (1024 * 2048). It's dynamic and resizes the texture to the best fit within the 2M area.
|
2015-01-30 02:00:35 +01:00 |
|
Atlante45
|
ff5ce25d19
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-29 16:55:51 -08:00 |
|
Atlante45
|
2d973e5288
|
Move updateMyAvatar to AvatarManager
|
2015-01-29 16:55:32 -08:00 |
|
Atlante45
|
6b7a391885
|
move a couple avatar initialisations outside avatar maanger
|
2015-01-29 16:00:57 -08:00 |
|
Atlante45
|
9095eeeeb9
|
Return WeakPointer in avatarHashMap
|
2015-01-29 15:50:59 -08:00 |
|
Sam Gateau
|
a2ec6ea2e0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-01-29 15:35:15 -08:00 |
|
Sam Gateau
|
b2f16be92a
|
Fixing the non loading of some texture because the QImage bit size is not exactly what's expected
|
2015-01-29 15:17:55 -08:00 |
|
Stephen Birarda
|
d7ad20e476
|
fix gpu CMakeLists for Android
|
2015-01-29 15:01:15 -08:00 |
|
Brad Hefta-Gaub
|
f5e092c0d2
|
Merge pull request #4187 from huffman/parallel-script-loading
Parallel script loading
|
2015-01-29 13:26:37 -08:00 |
|
ZappoMan
|
534575fd10
|
fix a couple bugs in 3d textured version of renderQuad
|
2015-01-29 13:16:14 -08:00 |
|
Stephen Birarda
|
763994da5a
|
handle gverb move to audio-client
|
2015-01-29 12:44:03 -08:00 |
|
ZappoMan
|
418b97a648
|
attempt to get color working for 3d textured quads
|
2015-01-29 12:04:34 -08:00 |
|
ZappoMan
|
87e91a5a94
|
Revert "attempt to get color working for 3d textured quads"
This reverts commit 0f390a98b8 .
|
2015-01-29 11:44:36 -08:00 |
|
Stephen Birarda
|
d3828c7d89
|
remove gverb from externals
|
2015-01-29 11:05:16 -08:00 |
|
Atlante45
|
ff88b7d4e6
|
Merge branch 'android' of git://github.com/birarda/hifi into android
|
2015-01-29 10:59:54 -08:00 |
|
ZappoMan
|
0f390a98b8
|
attempt to get color working for 3d textured quads
|
2015-01-29 10:50:13 -08:00 |
|
Stephen Birarda
|
fa166f012f
|
set size of GVRMainWindow to note 4 size
|
2015-01-29 10:11:46 -08:00 |
|
ZappoMan
|
4abb2481d6
|
removed old comment
|
2015-01-29 10:10:53 -08:00 |
|
Ryan Huffman
|
e6caefa023
|
Add comment to ScriptEngine::include()
|
2015-01-29 09:08:55 -08:00 |
|
Ryan Huffman
|
ce9e8910e4
|
Add callback to QScriptEngine::include(QString)
|
2015-01-29 09:04:57 -08:00 |
|
ZappoMan
|
5d2df7b03f
|
implement color for dashed lines
|
2015-01-28 18:51:23 -08:00 |
|
ZappoMan
|
efb044ea5e
|
change renderDashedLine() to take a color paramter
|
2015-01-28 15:08:59 -08:00 |
|
ZappoMan
|
7bd45ba0ca
|
change removing more glColor calls
|
2015-01-28 14:52:33 -08:00 |
|
ZappoMan
|
2f4e98082b
|
remove glColor calls related to text rendering
|
2015-01-28 13:54:48 -08:00 |
|
Atlante45
|
5bc98f5258
|
Merge branch 'android' of git://github.com/birarda/hifi into android
|
2015-01-28 13:14:08 -08:00 |
|
Atlante45
|
d68b59d4c7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-01-28 13:13:58 -08:00 |
|
Atlante45
|
4ef87b9919
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
interface/src/ui/Stats.cpp
libraries/audio-client/src/AudioClient.cpp
libraries/audio-client/src/AudioClient.h
|
2015-01-28 13:13:32 -08:00 |
|
Stephen Birarda
|
f1c6d26ed1
|
don't explicitly require LibOVR for android build
|
2015-01-28 11:20:25 -08:00 |
|
ZappoMan
|
7d9de6d0eb
|
added some TODO comments and some cleanup
|
2015-01-28 11:03:05 -08:00 |
|
ZappoMan
|
6821f31f14
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
libraries/gpu/src/gpu/GLBackend.cpp
|
2015-01-28 10:46:30 -08:00 |
|
ZappoMan
|
30f985a6fe
|
some cleanup
|
2015-01-28 10:30:05 -08:00 |
|
Sam Gateau
|
3e9e13ce01
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-01-28 10:27:40 -08:00 |
|
Sam Gateau
|
dc01611f26
|
Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded
|
2015-01-28 10:22:37 -08:00 |
|
Sam Gateau
|
3953a4c8c7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-01-28 00:10:20 -08:00 |
|
Sam Gateau
|
b6836af071
|
improving on the poin light attenuatiion formula
|
2015-01-28 00:09:15 -08:00 |
|
ZappoMan
|
9631761f70
|
get sphere normals correct
|
2015-01-27 21:39:59 -08:00 |
|
ZappoMan
|
e7742351b7
|
get sizing for spheres to work properly
|
2015-01-27 20:30:58 -08:00 |
|
Brad Hefta-Gaub
|
8994b9f51c
|
Merge pull request #4182 from AndrewMeadows/isentropic
fix bad integration of rapidly spinning objects
|
2015-01-27 18:33:31 -08:00 |
|
Brad Hefta-Gaub
|
aa2011a543
|
Merge pull request #4160 from samcake/temp0
Introducing the gpu::Texture class and using it for model rendering
|
2015-01-27 18:30:06 -08:00 |
|
Atlante45
|
98fc1836d8
|
Revert "Use QDickCache for every QNAM"
This reverts commit 2f39b93823 .
|
2015-01-27 18:09:22 -08:00 |
|
Andrew Meadows
|
58bb137c4d
|
bulletRotationStep --> computeBulletRotationStep
|
2015-01-27 17:37:12 -08:00 |
|
Andrew Meadows
|
23bd3f90d9
|
Bullet-style rotation integration for kinematics
and for dead reckoning after wire-transfer
|
2015-01-27 17:27:15 -08:00 |
|
ZappoMan
|
4a6cc5c6f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/ui/overlays/ImageOverlay.cpp
|
2015-01-27 16:44:11 -08:00 |
|
Andrew Meadows
|
b9ac5bb915
|
merge upstream/master into andrew/isentropic
|
2015-01-27 16:24:45 -08:00 |
|
Andrew Meadows
|
d1cf6559c5
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/physics/src/ObjectMotionState.cpp
|
2015-01-27 16:24:11 -08:00 |
|
Andrew Meadows
|
026c39e010
|
Merge pull request #4131 from Atlante45/pull_out_menu_mess
Settings - Part I
|
2015-01-27 16:23:23 -08:00 |
|
Atlante45
|
505f3f143b
|
Merge branch 'android' of git://github.com/birarda/hifi into android
|
2015-01-27 16:13:35 -08:00 |
|
Andrew Meadows
|
d5c0c200de
|
optimization for when physics engine doesn't step
|
2015-01-27 15:54:32 -08:00 |
|
Andrew Meadows
|
aebdd3b335
|
fix bad extrapolation of rapidly spinning objects
|
2015-01-27 15:53:37 -08:00 |
|
Sam Gateau
|
b9bbd7745f
|
Merge branch 'temp0' of https://github.com/samcake/hifi into temp1
|
2015-01-27 15:48:34 -08:00 |
|
Sam Gateau
|
db427cdf5e
|
adding Light class in model and the shader in render utils
|
2015-01-27 15:45:10 -08:00 |
|
Sam Gateau
|
ae3233b119
|
in the middle of something
|
2015-01-27 15:44:10 -08:00 |
|
Sam Gateau
|
f619acc3b5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-01-27 15:43:27 -08:00 |
|
Sam Gateau
|
4592bdcb4f
|
fixes after review by Brad
|
2015-01-27 15:42:56 -08:00 |
|
Atlante45
|
c25ae9d506
|
Merge branch 'android' of git://github.com/birarda/hifi into android
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityCollisionSystem.cpp
libraries/entities/src/EntityCollisionSystem.h
|
2015-01-27 15:04:17 -08:00 |
|
Stephen Birarda
|
d420674edd
|
apply orientation change to listening position for audio
|
2015-01-27 14:50:02 -08:00 |
|
Stephen Birarda
|
54660dd1a2
|
resolve conflicts on merge with upstream master
|
2015-01-27 14:24:48 -08:00 |
|
Ryan Huffman
|
7ececd793a
|
Fix failing QMetaObject::invokeMethod call
|
2015-01-27 13:59:46 -08:00 |
|
David Rowe
|
44083dd343
|
Add user warning if domain has mismatched packet versions
|
2015-01-27 13:10:11 -08:00 |
|
Andrew Meadows
|
e2ffe00c38
|
Merge pull request #4172 from huffman/fix-image-overlay-rescale
Fix image overlay rescale
|
2015-01-27 13:07:15 -08:00 |
|
Brad Hefta-Gaub
|
a46fda3749
|
Merge pull request #4174 from huffman/delete-entity
Update deleteEntity to obey entity locked property
|
2015-01-27 13:05:05 -08:00 |
|
Andrew Meadows
|
6b6e846378
|
Merge pull request #4177 from ZappoMan/fixGlitches
Some physics improvements
|
2015-01-27 13:02:11 -08:00 |
|
Andrew Meadows
|
f2f054f689
|
Merge pull request #4161 from ey6es/master
Partial implementation of "granularity" setting for metavoxel tools.
|
2015-01-27 12:52:32 -08:00 |
|
ZappoMan
|
23892ab1e7
|
fixed comments
|
2015-01-27 11:38:14 -08:00 |
|
ZappoMan
|
94e04e2d7d
|
removed extra whitespace
|
2015-01-27 11:34:46 -08:00 |
|
ZappoMan
|
b1586d4f90
|
move debug into ifdef
|
2015-01-27 11:29:17 -08:00 |
|
ZappoMan
|
45dbff67f8
|
more hacking
|
2015-01-27 11:15:33 -08:00 |
|
Atlante45
|
0f8e10b275
|
Merge branch 'android' of git://github.com/birarda/hifi into android
|
2015-01-27 11:14:36 -08:00 |
|
Ryan Huffman
|
9fd352e1dc
|
Break long lines in TextureCache.h/cpp
|
2015-01-27 10:27:05 -08:00 |
|
Ryan Huffman
|
f65640a593
|
Update EntityTree.cpp to not delete entity when locked
|
2015-01-27 10:24:54 -08:00 |
|
Ryan Huffman
|
86f7c28ee9
|
Update EntityScriptingInterface::deleteEntity to not delete when known entity is locked
|
2015-01-27 10:24:28 -08:00 |
|
Ryan Huffman
|
1f6932bdcb
|
Update TextureCache to store original image dimensions (pre-scale)
|
2015-01-27 08:09:20 -08:00 |
|
Atlante45
|
71b565c33c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
Conflicts:
interface/src/Application.cpp
|
2015-01-27 01:21:33 -08:00 |
|
ZappoMan
|
83d1cc911a
|
hacking
|
2015-01-26 19:38:24 -08:00 |
|
Atlante45
|
f84f6e9b66
|
Restore joints state on stopAnimation
|
2015-01-26 19:12:18 -08:00 |
|
ZappoMan
|
02c0700db3
|
support for skipping forward on new edit packets from server
|
2015-01-26 17:25:06 -08:00 |
|