Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 19:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10750 commits 71 branches 56 tags 1.2 GiB
Commit graph

10750 commits

This branch
This branch
All branches
Author SHA1 Message Date
stojce
438b072907 editVoxels - importing voxels 2014-03-06 02:29:12 +01:00
Andrzej Kapolka
78221c7de2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 17:13:00 -08:00
Andrzej Kapolka
d1747ed8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-05 17:12:37 -08:00
Andrzej Kapolka
60b0281095 Ordered visitation bits. 2014-03-05 17:12:02 -08:00
stojce
7f33762aab fixed invalid define guard 2014-03-06 01:49:27 +01: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
Philip Rosedale
c84d0d6467 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-05 14:30:35 -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
Andrzej Kapolka
c4f29005a0 Working on subdivision. 2014-03-05 14:13:20 -08:00
Philip Rosedale
2b0cdcc269 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-05 13:26:00 -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
Andrew Meadows
7db5aaaf37 new collision pipeline for avatar shapes 2014-03-05 07:08:59 -08:00
Andrew Meadows
a014d7883e minor whitespace formatting 2014-03-05 07:05:27 -08:00
ZappoMan
cba55282db cleanup headers 2014-03-05 02:42:49 -08:00
ZappoMan
15b5bb4385 Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds 
Conflicts:
	examples/bot.js
 2014-03-05 02:21:40 -08:00
ZappoMan
161e04f1a8 flocking bird JS 2014-03-05 02:20:03 -08:00
Andrzej Kapolka
63b4a2453b Lots of work on metavoxel LODs and spanners. 2014-03-04 21:27:13 -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
a3b64d2c38 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-04 16:52: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