Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 14:23:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10369 commits 6 branches 1 tag 1.1 GiB
Commit graph

10369 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
0f5fbb5fab pull out glew and freeglut so they can be external dependencies 2014-03-06 17:09:59 -08:00
Stephen Birarda
5373cbbb9b Merge pull request #2228 from josecpujol/fix_2198 
Changed the up vector for computing the scale factor: it failed when
 2014-03-06 14:49:13 -08:00
AndrewMeadows
da83c97b3e Merge pull request #2226 from birarda/external-glm 
make glm an external dependency
 2014-03-06 14:40:18 -08:00
Stephen Birarda
83ae77670a fix link to gitter in README 2014-03-06 14:23:04 -08:00
Stephen Birarda
04807dd5d1 include cstdio for snprintf call in BandwidthDialog 2014-03-06 13:31:08 -08:00
Jose Carlos
8e81c4c467 Changed the up vector for computing the scale factor: it failed when 
there was a roll in the view
 2014-03-06 21:49:36 +01:00
Stephen Birarda
820dc7f45f include cstdio for sprintf call 2014-03-06 12:41:25 -08:00
Stephen Birarda
90d4bbee78 Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm 2014-03-06 09:16:22 -08:00
Philip Rosedale
a39b0313c9 Merge pull request #2216 from ey6es/master 
Generate mipmaps for avatar textures, fix shadows (don't render display names into the shadow map).
 2014-03-05 18:18:23 -08:00
Andrzej Kapolka
82011905be Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 18:10:55 -08:00
Andrzej Kapolka
a7af3bc284 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-05 18:08:59 -08:00
Philip Rosedale
e05e5e90cf Merge pull request #2213 from ZappoMan/particle_collions_penetration 
added penetration support to particle collisions JS callbacks
 2014-03-05 18:07:50 -08:00
Andrzej Kapolka
ad25455f86 Track hysteresis for next model separately, but just in case, don't use 
recursion to fall back on hysteresis value.  Closes #2209.
 2014-03-05 18:06:14 -08:00
ZappoMan
a54e401377 Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration 
Conflicts:
	libraries/script-engine/src/Vec3.cpp
 2014-03-05 18:04:57 -08:00
Philip Rosedale
828159cdcb Merge pull request #2204 from ZappoMan/flocking_birds 
Flocking birds & more
 2014-03-05 18:01:41 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes 
Collision Shapes
 2014-03-05 17:59:42 -08:00
Andrzej Kapolka
3930b3e824 Display names are great, but not in the shadow map. Closes #2208. 2014-03-05 17:44:08 -08:00
Andrzej Kapolka
78221c7de2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 17:13:00 -08:00
Stephen Birarda
284cd6bb30 more header repair in the README 2014-03-05 16:44:32 -08:00
Stephen Birarda
162b4b7e5f fix full stack header in README 2014-03-05 16:41:57 -08:00
Stephen Birarda
f7e5b7c0e8 add a README section inviting chat 2014-03-05 16:33:41 -08:00
Stephen Birarda
f6263010d4 add an extra line before emphasis line for pull requests 2014-03-05 16:31:51 -08:00
Stephen Birarda
32dc012330 add a line about submitting a pull request 2014-03-05 16:31:24 -08:00
Stephen Birarda
3afbdabd66 fixes to coding instructions in contributing 2014-03-05 16:29:37 -08:00
Stephen Birarda
4857268ab7 add some more information to the CONTRIBUTING guide 2014-03-05 16:22:38 -08:00
Stephen Birarda
53da23cdf0 more header cleanup in the README 2014-03-05 16:09:49 -08:00
Stephen Birarda
e7820d667f add a stubbed CONTRIBUTING document 2014-03-05 16:09:12 -08:00
Stephen Birarda
4c807defe0 more README simplification, rename INSTALL to BUILD 2014-03-05 16:06:48 -08:00
Stephen Birarda
6ce0e75468 fix a link to the install guide from README 2014-03-05 16:04:41 -08:00
Stephen Birarda
bf7eb97d3d simplify the README instructions for running own world 2014-03-05 16:04:01 -08:00
Stephen Birarda
378230c983 add information for High Fidelity custom qt5 formula 2014-03-05 15:57:10 -08:00
Stephen Birarda
86913236cf install guide header tweaks and Qt5 dependencies for linux 2014-03-05 15:54:25 -08:00
Stephen Birarda
a5b49f191b add instructions for GLM_ROOT_DIR for windows 2014-03-05 15:49:01 -08:00
Stephen Birarda
12db7877a7 add more instructions for windows builds 2014-03-05 15:45:21 -08:00
Stephen Birarda
b371f96721 add information for placing windows DLLs in path 2014-03-05 15:41:57 -08:00
Stephen Birarda
ae6b11c497 fix link to INSTALL guide from README 2014-03-05 15:36:02 -08:00
Stephen Birarda
661361424b cleanup the README to point to the INSTALL guide 2014-03-05 15:35:25 -08:00
Stephen Birarda
ede32b5f1a resolve conflicts on merge with upstream master 2014-03-05 15:31:00 -08:00
Stephen Birarda
5d12a55ee1 fix link to VS2010 in install guide 2014-03-05 15:27:10 -08:00
Stephen Birarda
2fb1a51255 repair linking to homebrew in install guide 2014-03-05 15:26:33 -08:00
Stephen Birarda
2e58b78f7a fix linking at the top of INSTALL guide 2014-03-05 15:25:46 -08:00
Stephen Birarda
d83801e390 first pieces of an in-repo install guide 2014-03-05 15:22:06 -08:00
ZappoMan
d89cb2bf5e added penetration support to particle collisions JS callbacks 2014-03-05 15:03:54 -08:00
ZappoMan
78479b33c3 Merge pull request #2206 from birarda/master 
add time to interface log output
 2014-03-05 14:17:37 -08:00
Andrew Meadows
a1856ac18b fix bad transform math for placing shapes 2014-03-05 11:57:07 -08:00
Andrew Meadows
89f664c0ee fixing incorrect documentation comment 2014-03-05 11:52:47 -08:00
Andrew Meadows
2bc8e142b4 cruft removal 2014-03-05 11:51:42 -08:00
ZappoMan
b329030c60 Merge pull request #2207 from ZappoMan/bugfixes 
fix failed create voxel with key press 0 at startup of editVoxels.js
 2014-03-05 10:53:28 -08:00
ZappoMan
c34f76620f fix failed create voxel with key press 0 at startup of editVoxels.js 2014-03-05 10:52:46 -08:00
Stephen Birarda
395263ff3d add time to the interface logs - closes #2205 2014-03-05 09:55:06 -08:00