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

632 commits

Author SHA1 Message Date
ericrius1
94acb23f27 no longer redefining payloadRender method in effort to avoid linux build errors 2015-08-03 15:51:11 -07:00
ericrius1
b2753507dc cleanup of comments and dead code 2015-08-03 09:35:47 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
ericrius1
b4a9469dff colors 2015-07-28 11:42:23 -07:00
Sam Gateau
baf7873ce1 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-27 17:40:19 -07:00
Sam Gateau
f525a8a245 Removing all the unecessary calls of Batch from the gl legacy time 2015-07-27 17:17:56 -07:00
Anthony J. Thibault
5844b594dc Converted magic numbers to constants. 2015-07-27 09:27:16 -07:00
Anthony J. Thibault
5cc0b45850 Improved ParticleEffectEntityItem rendering and updates 
* Created custom pipelines and shaders for untextured and textured
  particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
  new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
  based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
  now we just update all the time.  (super cheap tho, if there are no particles
  animating)
 2015-07-26 17:21:17 -07:00
ericrius1
b44193c2ad catching end of texture 2015-07-22 17:25:33 -07:00
ericrius1
3379291b05 making uv mapping DRIER 2015-07-22 16:13:02 -07:00
ericrius1
352c42d8d4 head body tail 2015-07-22 15:40:29 -07:00
ericrius1
75220a32e7 tail dynamic 2015-07-22 14:49:48 -07:00
ericrius1
b452566d75 transparent textures and setting up 9-patch system for texture scaling 2015-07-22 10:57:03 -07:00
ericrius1
99856df112 tail strip 2015-07-21 11:43:10 -07:00
ericrius1
e1f8871ec9 drawing trails at end of stroke 2015-07-21 10:48:25 -07:00
ericrius1
b9affba93f textures working 2015-07-21 09:56:09 -07:00
ericrius1
9fc54a6040 getting closer to texturing properly 2015-07-20 15:33:21 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
ericrius1
1e34de1c51 adding in screen space effect for getting hit 2015-07-20 10:44:38 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
ericrius1
bad6aa8f0a adding textures to poly line" 2015-07-17 15:39:44 -07:00
ericrius1
a44e5f949c Merge branch 'master' into polyLineInProgress 2015-07-17 15:01:40 -07:00
ericrius1
5e3e1e4567 adding texture 2015-07-17 15:00:10 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -07:00
Atlante45
8fb69ecc96 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 13:50:58 -07:00
Clément Brisset
17c6f41db6 Merge pull request #5306 from ctrlaltdavid/20606 
CR for 20606 - If an external texture isn't found, still display the model
 2015-07-14 13:49:00 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
ericrius1
c4194cd030 adding textures 2015-07-14 09:38:55 -07:00
Brad Davis
684d466b44 Merge pull request #5308 from venkatn93/avatar 
Avatars rendered correctly based on Scene.shouldRenderAvatars
 2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0 More coding standard changes 2015-07-14 00:45:38 -07:00
ZappoMan
5676246d75 fix the lingering model parts sometimes left behind when switching domains 2015-07-13 15:26:52 -07:00
ericrius1
f54d1cf0f6 smoother line drawing over network 2015-07-13 14:24:26 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
ericrius1
b3b12bd2dc adding custom shader for flipped normals 2015-07-13 08:54:53 -07:00
David Rowe
d44743563b Merge branch 'master' into 20606 
Conflicts:
	libraries/render-utils/src/Model.cpp
 2015-07-13 07:53:04 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
David Rowe
8ecefdfe39 If an external texture isn't found, still display the model 
If the texture is present the next Interface is run then it will be used.
 2015-07-10 16:03:27 -07:00