Commit graph

10306 commits

Author SHA1 Message Date
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
78479b33c3 Merge pull request #2206 from birarda/master
add time to interface log output
2014-03-05 14:17:37 -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
ZappoMan
2e3e699e31 Merge pull request #2199 from PhilipRosedale/master
Adjustable bot pelvis height
2014-03-04 18:47:01 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication
remove deprecated qt5 methods in CMakeList files
2014-03-04 18:30:22 -08:00
Philip Rosedale
ae900ec39c Merge pull request #2200 from ZappoMan/particle_collisions
fix failed lock causing particle collisions to not work
2014-03-04 16:48:20 -08:00
Philip Rosedale
868e6ba738 Merge pull request #2201 from ZappoMan/bugfixes
fix infinite reloading of missing script files
2014-03-04 16:47:19 -08:00
ZappoMan
c031359a54 fix infinite reloading of missing script files 2014-03-04 16:20:17 -08:00
Stephen Birarda
494bf59e9b remove the winsdk hack to solve with VS SP1 2014-03-04 15:59:49 -08:00
Stephen Birarda
b78e723253 fix a NaN in ViewFrustum and BuckyBalls 2014-03-04 15:53:05 -08:00
Stephen Birarda
161b8ad50b remove double inclusion of glm 2014-03-04 15:25:47 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
ZappoMan
c90d4a9514 fix failed lock causing particle collisions to not work 2014-03-04 15:07:30 -08:00
Philip Rosedale
2c27c6b8c1 adjustable height of bot avatars 2014-03-04 15:03:30 -08:00
Clément Brisset
6d1748e5b9 Merge pull request #2197 from Atlante45/freeglut_fix
Freeglut fix
2014-03-04 13:19:57 -08:00
Atlante45
f90062b38c Merge branch 'master' of https://github.com/highfidelity/hifi into freeglut_fix 2014-03-04 13:18:22 -08:00
Atlante45
3c99cf162d Fix was at the wrong spot 2014-03-04 13:17:19 -08:00
Stephen Birarda
a48185053e repair a typo in particles link to widgets lib 2014-03-04 12:42:08 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
AndrewMeadows
ea0fe95baa Merge pull request #2191 from birarda/null-checks
more null pointer cleanup
2014-03-04 12:07:39 -08:00
ZappoMan
d5e7e98b5e Merge pull request #2192 from Atlante45/freeglut_fix
fix for windows
2014-03-04 11:51:14 -08:00
ZappoMan
f7a0d878dd Merge pull request #2182 from Atlante45/local_voxels
Local voxels
2014-03-04 11:48:10 -08:00
Andrzej Kapolka
7117c5043f Merge pull request #2193 from ey6es/master
Use different unused variable warning suppressor for GCC.
2014-03-04 11:24:25 -08:00
Andrzej Kapolka
6ff629dcfd Use different unused variable warning suppressor for GCC. 2014-03-04 11:23:44 -08:00
Atlante45
9767846c91 fix for windows 2014-03-04 11:06:23 -08:00
Atlante45
894f85fcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-04 10:49:26 -08:00
Atlante45
66b0590509 Review fixes 2014-03-04 10:48:53 -08:00