Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 13:00:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21035 commits 25 branches 0 tags 1.1 GiB
Commit graph

6784 commits

Author SHA1 Message Date
Andrew Meadows
1184f5b668 merge upstream/master into andrew/inertia 2015-01-10 12:45:14 -08:00
Andrew Meadows
25e64d619c move statics out of EntityItem 
This makes for much more readable core dumps
 2015-01-10 11:46:42 -08:00
Andrew Meadows
ecd352fd4d merge upstream/master into andrew/bispinor 2015-01-10 07:47:52 -08:00
Andrew Meadows
99e1fdd46e fix for EntityServer crash 
adding EntityItem::_element backpointer for easier add/remove logic
 2015-01-10 07:44:26 -08:00
Andrzej Kapolka
d002359989 Stitching improvement. 2015-01-09 16:43:51 -08:00
chris
8bb69d0a90 Update std::string instances to QString 2015-01-09 16:22:52 -08:00
Brad Hefta-Gaub
f18594cfdb Merge pull request #4076 from Atlante45/master 
Don't call delete later unless you have to
 2015-01-09 15:43:45 -08:00
Atlante45
6d67b8e20c Don't call delete later unless you have to 2015-01-09 15:32:08 -08:00
Andrzej Kapolka
dfbc3502fa Use ray intersection code to get heightfield height. 2015-01-09 15:06:47 -08:00
Atlante45
063e95bd79 Clement doesn't know how to use radians 2015-01-09 14:31:34 -08:00
Andrzej Kapolka
70890c68aa "Fill" brush (removes dual contour data). 2015-01-09 14:19:13 -08:00
Andrzej Kapolka
e3074d726b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/metavoxels/src/Spanner.cpp
 2015-01-09 11:52:05 -08:00
Andrzej Kapolka
d82f269263 Don't show grid for tools where it isn't needed, started on "fill" tool. 2015-01-09 11:46:40 -08:00
Atlante45
02b9aaacf8 Bump packet version 2015-01-09 11:16:58 -08:00
Atlante45
f2b7cb005a Removed leans/Changed Head rotation in avatardata packets 2015-01-09 11:16:49 -08:00
Atlante45
16e1fc8c3a Added isMyAvatar to AvatarData too 2015-01-09 11:16:05 -08:00
Atlante45
05d2887c94 Move Torso twist to HeadData with Lean 2015-01-09 11:15:01 -08:00
Andrew Meadows
4946ec18b6 remove some TODO comments 2015-01-09 09:28:01 -08:00
Philip Rosedale
336378679f Merge pull request #4068 from ctrlaltdavid/type-definitions 
Fix miscellaneous types and casts
 2015-01-09 08:40:08 -08:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Andrzej Kapolka
0dc4b26367 Basic stack merging. 2015-01-08 21:37:53 -08:00
Atlante45
441a1e4fee Turns out windows doesn't like constexpr 2015-01-08 18:35:23 -08:00
Atlante45
891d8d5abf Removed unecessary foreach 2015-01-08 18:22:25 -08:00
David Rowe
a5b3ae397a Code review 2015-01-08 18:20:23 -08:00
Atlante45
ea832cfd45 Added constant 2015-01-08 17:33:47 -08:00
Atlante45
77e4a2ef35 Add byte limit to chaches 2015-01-08 17:06:05 -08:00
Atlante45
1c4903c346 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 16:33:01 -08:00
David Rowe
75758c1a3e Use static GLEW in render-utils for Windows 2015-01-08 15:40:54 -08:00
Andrzej Kapolka
c99e2c3ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-01-08 14:57:03 -08:00
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -08:00
Atlante45
8dbaeeb646 Delete each entityItems 2015-01-08 13:08:43 -08:00
Andrzej Kapolka
ec32739689 CSG improvements. 2015-01-08 12:52:52 -08:00
Andrew Meadows
f8c512b690 fix deleteEntity() to actually delete result 2015-01-08 12:42:16 -08:00
Atlante45
e73f8baf93 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 11:54:54 -08:00
Atlante45
6fc3e1cf81 change message size 2015-01-08 11:51:14 -08:00
Atlante45
af9525ed33 Bump AvatarData packet number 2015-01-08 11:49:39 -08:00
Atlante45
0bae05b924 Remove chat message 2015-01-08 11:25:53 -08:00
Atlante45
b8a3bdb6bd Cleanup headers 2015-01-08 11:25:35 -08:00
Andrew Meadows
b0b2eb5d38 use exact equality for filtering dimension changes 2015-01-08 11:09:32 -08:00
Andrew Meadows
1d371a9627 merge upstream/master into andrew/inertia 2015-01-08 10:24:05 -08:00
Andrew Meadows
c37c1515ba EntitySimulation is lockable 
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
 2015-01-08 10:22:25 -08:00
Andrzej Kapolka
4c3163fae8 Closer to working stitching. 2015-01-07 17:24:26 -08:00
Andrew Meadows
d2bd95703a use degrees/sec for EntityItem angular velocity 2015-01-07 14:04:22 -08:00
Andrew Meadows
af9bafae87 fix typo 2015-01-07 12:48:16 -08:00
Andrew Meadows
1745548665 fix rapid attenuation of angular velocity 2015-01-07 12:42:50 -08:00
Andrzej Kapolka
48fb9a27ba Progress on heightfield/voxel interface. 2015-01-06 17:55:04 -08:00
ZappoMan
e0338dd787 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-06 16:42:25 -08:00
Clément Brisset
fb6fb8a38d Merge pull request #4050 from birarda/lasagna-not-spaghetti 
put back current address storage in Menu
 2015-01-06 16:29:52 -08:00
Stephen Birarda
9c191be106 use the AddressManager's method to store current address 2015-01-06 16:13:06 -08:00
ZappoMan
1bc91e7d29 removed renderTriangleProxies 2015-01-06 16:01:06 -08:00
Andrzej Kapolka
78c4bcd2ec Heightfield conversion Hermite bits. 2015-01-06 15:39:06 -08:00
Andrzej Kapolka
a20b12ad44 Material painting for stacks. 2015-01-06 14:25:26 -08:00
ZappoMan
1bfce7d876 more removal of immediate mode 2015-01-06 14:14:13 -08:00
ZappoMan
873403a333 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/Menu.h
 2015-01-06 12:27:16 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
ZappoMan
ac1f7c9a84 multi-mode renderVertices 2015-01-06 09:52:27 -08:00
Stephen Birarda
5fadfa8c17 remove doubled friend declaration, is in macro 2015-01-06 09:35:11 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
Andrew Meadows
f3255eeb0e Merge pull request #4008 from birarda/lasagna-not-spaghetti 
some Audio cleanup in prep for audio untangle
 2015-01-06 09:13:12 -08:00
ZappoMan
570607c044 renderLines 2015-01-06 08:58:41 -08:00
ZappoMan
0606861b66 dashed lines in GeometryCache 2015-01-05 21:45:17 -08:00
ZappoMan
a9b7367fa9 more work on eliminating immediate mode calls 2015-01-05 20:51:05 -08:00
Brad Hefta-Gaub
a88346467b Merge pull request #4042 from samcake/tot 
Change sun location to be the direction for lighting
 2015-01-05 20:36:28 -08:00
ZappoMan
9545bd1907 add alternate renderGrid for audio scope 2015-01-05 19:34:37 -08:00
Andrzej Kapolka
5a46f3e20d Material/ray testing bits. 2015-01-05 18:37:47 -08:00
Sam Gateau
4ffb3e4e7e just do the sun location modification 2015-01-05 17:31:47 -08:00
Andrew Meadows
0a8437a578 increasing default restitution to 0.5 2015-01-05 17:31:23 -08:00
ZappoMan
bd1612f6a4 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-05 16:51:31 -08:00
Sam Gateau
2fdcbb1a97 changing the atmoshpere position 2015-01-05 16:46:42 -08:00
ZappoMan
a20fa1242d first cut are removing immediate mode GL_LINES 2015-01-05 15:46:48 -08:00
Andrew Meadows
e2884c56f5 only predict remote transform for moving objects 2015-01-05 15:16:03 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
Andrew Meadows
11de33b98b merge upstream/master into andrew/inertia 2015-01-05 15:02:53 -08:00
Andrew Meadows
75a8faec86 purge support for voxels from PhysicsEngine 2015-01-05 15:02:18 -08:00
Andrew Meadows
244a8503ef include damping in remote extrapolation model 2015-01-05 14:48:16 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
ZappoMan
c2d45df541 add renderBevelCornersRect to GeometryCache 2015-01-05 14:39:14 -08:00
Andrzej Kapolka
808cb2e4bc Substantial cleanup, working on interface between heightfields and dual 
contour surfaces.
 2015-01-05 14:33:40 -08:00
Sam Gateau
f03b253260 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Sam Gateau
901ea16ba0 clean code 2015-01-05 13:17:12 -08:00
Brad Hefta-Gaub
125dc5010e Merge pull request #4039 from AndrewMeadows/inertia 
Bullet physics part 2
 2015-01-05 13:10:55 -08:00
Sam Gateau
7529b3d1b0 clean code 2015-01-05 13:10:32 -08:00
Andrew Meadows
0b9c9daed9 Merge pull request #4034 from ZappoMan/multiThreadedPerformanceTimer 
Multi threaded performance timer
 2015-01-05 13:01:59 -08:00
dev
e3d474db3d FIx shaders for mac 2015-01-05 12:27:16 -08:00
Andrew Meadows
6fb4e1f622 oops, need to update angularVelocity after damping 2015-01-05 12:23:55 -08:00
Andrew Meadows
bf6b8f9ca7 do not zero small velocities for non-bullet case 2015-01-05 12:01:09 -08:00
Sam Gateau
b8e44a3e7a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes 2015-01-05 11:27:29 -08:00
Andrew Meadows
3b7770f405 change meaning of damping to agree with bullet 
0 = no damping
1 = 100% damping

The new formula is: velocity *= (1 - damping)^dt
 2015-01-05 11:23:01 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
Andrew Meadows
d032eab0de merge upstream/master into andrew/inertia 2015-01-05 09:19:37 -08:00
Andrew Meadows
30200ef7eb add damping to ObjectMotionState 2015-01-05 09:17:46 -08:00
Philip Rosedale
a01ab38f1b Merge pull request #4029 from Atlante45/new_glm_fix 
Fix compile error with new glm version
 2015-01-04 11:26:37 -08:00
Andrzej Kapolka
a504d03b14 Normal fix. 2015-01-02 17:14:17 -08:00
ZappoMan
4cc641320b fix PerformanceTimer to handle timer stacks on multiple threads 2015-01-02 15:04:48 -08:00
ZappoMan
139f96c8b0 remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe 2015-01-02 14:41:09 -08:00
Philip Rosedale
384899e977 Merge pull request #4032 from Atlante45/uninitialized_entity_members 
Initialize entities' _locked and _script
 2015-01-02 14:01:55 -08:00
Andrzej Kapolka
3959f99910 Fixed voxel textures. 2015-01-02 13:57:27 -08:00
Atlante45
022beff569 Initialize entities' _locked and _script 2015-01-02 12:37:00 -08:00
Sam Gateau
46ab4833be applying the shadowing improvment to the cascaceded path shader and cleaning the code 2015-01-02 12:12:41 -08:00
Sam Gateau
24d39f4453 refining the shadowing 2015-01-02 11:29:54 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -08:00
Andrzej Kapolka
e242459ea2 More render progress. 2014-12-31 17:33:43 -08:00
Andrew Meadows
0d3e78fdb8 modify extrapolation behavior when bullet enabled 
Allows Bullet to specify an object as "at rest"
by setting velocity to zero.
Also, moved velocity damping above position integration
to get the same order of operations as Bullet.
 2014-12-31 16:32:09 -08:00
Andrzej Kapolka
08dfd28ec0 More rendering bits. 2014-12-31 15:53:38 -08:00
Atlante45
b1f0ec8dfb Fix compile error with new glm version 2014-12-31 15:49:56 -08:00
Sam Gateau
02949dbc5a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-31 10:59:42 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
Philip Rosedale
bd88e0f38d Merge pull request #4026 from ZappoMan/entityScriptsAndEvents 
evaluate entity scripts in a sandbox before constructing
 2014-12-31 10:44:55 -08:00
Brad Hefta-Gaub
eaa6d4455d Merge pull request #4024 from samcake/temp1 
Moving deferred lighting shaders from the resource folder to embedded source in the executable
 2014-12-31 10:33:30 -08:00
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
ZappoMan
eb28efa648 evaluate entity scripts in a sandbox before constructing 2014-12-31 09:58:18 -08:00
Sam Gateau
e1a295fb37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-31 08:40:15 -08:00
Andrew Meadows
ec1ef39a7f Merge pull request #4023 from PhilipRosedale/master 
Torso twists to follow head, fix bug with head rotations
 2014-12-31 08:01:39 -08:00
ZappoMan
67595ea571 more voxelEctomy 2014-12-30 20:35:21 -08:00
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
ZappoMan
278ed96f14 more work on voxelEctomy 2014-12-30 18:54:53 -08:00
ZappoMan
49d8f2b2f5 more work on voxelEctomy 2014-12-30 18:52:33 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
Andrzej Kapolka
83967d49cf More rendering bits. 2014-12-30 18:16:49 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Sam Gateau
ae6ccf1a7d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-30 17:56:08 -08:00
Sam Gateau
4fb9e9c775 cleaning the code 2014-12-30 17:55:49 -08:00
Sam Gateau
8d95639416 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:43:52 -08:00
Sam Gateau
37017d0c16 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:42:10 -08:00
Philip Rosedale
dc9937e11a only twist own body, remove unused head functions 2014-12-30 17:02:53 -08:00
samcake
20d66d201e Merge pull request #4020 from ZappoMan/gpuStreamizing 
Improvements to GeometryCache::renderQuad()
 2014-12-30 16:49:16 -08:00
Andrzej Kapolka
de4776ef08 More progress on rendering. 2014-12-30 15:36:22 -08:00
ZappoMan
86a9d5719b fix one more case of animaiton stutter 2014-12-30 15:12:23 -08:00
Clément Brisset
860098585c Merge pull request #4018 from samcake/temp0 
Moving the shaders used in Model.cpp from resources folder into the built-in executable
 2014-12-30 13:36:13 -08:00
ZappoMan
eb4b8291d7 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 13:28:49 -08:00
ZappoMan
4e6ed4a449 fix comments 2014-12-30 13:26:13 -08:00
Andrzej Kapolka
135e3bf574 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-30 13:25:57 -08:00
ZappoMan
28569836bb rename parameters and reuse previously registered quad if geometry didn't change 2014-12-30 13:24:31 -08:00
Andrew Meadows
6f72d4ad81 easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
Andrzej Kapolka
180bed4609 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-30 12:51:03 -08:00
Sam Gateau
a022e94814 Adding the shader files 2014-12-30 12:38:36 -08:00
ZappoMan
be137534b5 first cut at registered quads to reduce copies of constantly changing quads 2014-12-30 12:38:16 -08:00
Sam Gateau
e752edc44a Moving the shaders used in Model.cpp from resources folder into the built-in executable 2014-12-30 12:35:00 -08:00
Andrzej Kapolka
c9b3b5ff7d Scale back on first dropped packet, use Qt send/receive buffer size options 
rather than setsockopt/getsockopt.
 2014-12-30 12:30:38 -08:00
Andrew Meadows
5e2246625b fix layout to abide by the coding standard 2014-12-30 12:09:22 -08:00
Clément Brisset
9a1c521df2 Merge pull request #4014 from ZappoMan/animationFrameIndex 
Fix stuttering in animation caused when animation plays too long without lastFrame set
 2014-12-30 12:07:26 -08:00
Andrew Meadows
e43d7b7369 fix indentation in ctor init 2014-12-30 12:05:28 -08:00
Andrew Meadows
da551a0a76 restore script change detection to what it was 2014-12-30 11:56:39 -08:00
Andrew Meadows
ba873deb49 ignore Entity updates that don't change anything 2014-12-30 11:38:24 -08:00
ZappoMan
53a7d83f35 CR feedback spacing 2014-12-30 10:33:22 -08:00
ZappoMan
cb951763fd CR feedback spacing 2014-12-30 10:29:18 -08:00
ZappoMan
a4520f6a07 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 10:27:06 -08:00
ZappoMan
a0ec2ddfe9 clamp frame index between 0 and 100,000 2014-12-29 21:07:04 -08:00
Andrzej Kapolka
fbd4ca5c08 More work on rendering. 2014-12-29 18:37:06 -08:00
Andrew Meadows
ce14c823a1 add comment about stubbed ObjectMotionState 
for when Bullet lib is not found
 2014-12-29 16:41:27 -08:00
Andrew Meadows
a97b8b0ea9 fix memory leak of EntityMotionState's 2014-12-29 16:33:41 -08:00
Andrew Meadows
97f44b64fc assert NULL EntityItem::_physicsInfo in dtor 2014-12-29 15:27:54 -08:00
Andrew Meadows
213133c705 restoring EntityTreeElement::cleanupEntities() 2014-12-29 15:19:25 -08:00
Andrzej Kapolka
c78d38b925 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-29 14:38:17 -08:00
Andrzej Kapolka
84a2a8b83d Working on rendering. 2014-12-29 14:37:53 -08:00
ZappoMan
49e350fab2 Merge branch 'master' of https://github.com/highfidelity/hifi into animationFrameIndex 2014-12-29 14:01:35 -08:00
Andrew Meadows
8cb8092310 remove unused code 
I forget what I was using UUIDHashKey for
 2014-12-29 10:55:47 -08:00
Andrew Meadows
58f3436d9b fix bug in != operator 2014-12-29 10:50:06 -08:00
Andrew Meadows
b078850c6a remove personal TODO list from code file 2014-12-29 10:46:56 -08:00
Andrew Meadows
0ec56816c0 remove unused variable cruft 2014-12-29 10:43:09 -08:00
Andrew Meadows
bef14a46ac remove commented out cruft 2014-12-29 10:41:19 -08:00
Stephen Birarda
e02f81da01 fix a call to address manager in nodelist 2014-12-29 11:00:49 -07:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Sam Gateau
6628f7b811 replace the model.frag and model.vert files from resource by the sl version of the shaders 2014-12-25 19:57:27 -08:00
ZappoMan
0790bd77b7 almost completely eliminate immediate mode QUADS 2014-12-24 11:14:50 -08:00
ZappoMan
02a1721185 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-24 10:25:41 -08:00
dev
42157161e0 fix the c++ header generation for mac though the brand new raw string format of c++11 2014-12-23 18:19:25 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
Sam Gateau
6f66b097f8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-23 14:07:28 -08:00
ZappoMan
72cced12a6 guards for NULL collisions, possible fix to fountain crash 2014-12-23 11:30:32 -08:00
ZappoMan
17ed92cf7e fix runaway backup bug 2014-12-23 10:11:08 -08:00
ZappoMan
1f307e9667 more work on removing immediate mode GL_QUADS 2014-12-23 09:50:38 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
Sam Gateau
6b88eaceb5 FIx typos 2014-12-22 15:44:46 -08:00
Sam Gateau
bc83641300 add comments to Transform.h 2014-12-22 14:05:09 -08:00
ZappoMan
14458ac8fd first pass at removing immediate mode GL_QUADS 2014-12-22 13:47:18 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Sam Gateau
1ae682ff21 fix end line typo 2014-12-22 11:36:18 -08:00
Sam Gateau
979d50f7d8 fixed pointers which were using 0 instead of NULL and syntax in resource.h 2014-12-22 11:20:04 -08:00
Sam Gateau
9ab6a680e9 fix typo in cmakelists 2014-12-22 11:03:08 -08:00
Sam Gateau
4c670ac17a merging with upstream master and origin temp0 2014-12-22 10:38:11 -08:00
Brad Hefta-Gaub
fb15b0f2a7 Merge pull request #3992 from samcake/temp0 
Add the BufferView class in gpu::Resource
 2014-12-22 10:12:48 -08:00
Brad Hefta-Gaub
483155f246 Merge pull request #3989 from birarda/master 
fix luckily linked dependencies in prep for shared hifi libraries
 2014-12-21 11:34:43 -08:00
Andrzej Kapolka
4153e32f57 Normal fix. 2014-12-19 18:31:49 -08:00
Andrzej Kapolka
a563c66ab8 Neighbor Hermite bits. 2014-12-19 17:16:45 -08:00
Sam Gateau
967c6dbc4b Add the Model library 2014-12-19 16:19:06 -08:00
Andrew Meadows
3e087bd75e Merge pull request #3990 from ZappoMan/entityScriptsAndEvents 
Entity Scripts bug fixes/improvements
 2014-12-19 16:02:00 -08:00
Andrzej Kapolka
2711b3f312 Closer to working edits. 2014-12-19 15:37:58 -08:00
Stephen Birarda
2780415b1d put glew link back into gpu 2014-12-19 15:07:31 -08:00
Stephen Birarda
d7d11955f3 Revert "add a test to confirm link fail" 
This reverts commit 691be3bf7c.
 2014-12-19 15:05:13 -08:00
Stephen Birarda
691be3bf7c add a test to confirm link fail 2014-12-19 14:59:55 -08:00
Stephen Birarda
9bd0bc671b resolve conflicts on merge with upstream master 2014-12-19 14:48:18 -08:00
Stephen Birarda
bd69a3aae3 Merge pull request #3993 from ZappoMan/gluRemoval 
more glu/glut removal
 2014-12-19 14:44:29 -08:00
ZappoMan
b7165abd5b possible glew warning fix for windows 2014-12-19 14:33:45 -08:00
ZappoMan
22e2fcf746 add some vec2 debugging 2014-12-19 13:46:42 -08:00
Sam Gateau
a7b039fbb9 Disabling glDebug 2014-12-19 13:28:19 -08:00