Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 22:42:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10491 commits 6 branches 1 tag 1.1 GiB
Commit graph

10491 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
ZappoMan
ed703673b6 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:41:06 -08:00
ZappoMan
374af9eeb5 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:40:49 -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
Andrzej Kapolka
1357aee01e Use mipmaps and trilinear filtering for models. Closes #2180. 2014-03-04 13:03:31 -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
Andrew Meadows
57e217c7fb Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 12:10:12 -08:00
AndrewMeadows
ea0fe95baa Merge pull request #2191 from birarda/null-checks 
more null pointer cleanup
 2014-03-04 12:07:39 -08:00
Andrew Meadows
455ef15754 fix warning about signed/unsigned comparison 2014-03-04 12:05:00 -08:00
Andrew Meadows
0f586cc0fb fix warning about unused variable 2014-03-04 12:03:48 -08:00
Andrew Meadows
eec8affd84 fix warning about unused variable 2014-03-04 11:56:22 -08:00
Andrew Meadows
2faaa5beef fix warnings about signed/unsigned comparison 2014-03-04 11:54:58 -08:00
Andrew Meadows
16a5af1a8e fix warning about signed/unsigned comparison 2014-03-04 11:53:08 -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
Andrew Meadows
2ba05f2cb8 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 2014-03-04 11:45:31 -08:00
Andrew Meadows
d537b4118d Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 11:40:59 -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
Andrew Meadows
427cf02d03 Merge branch 'cleanup' to 'cleanup2' 2014-03-04 11:20:42 -08:00
Andrew Meadows
918cd39f5d adding warnings to linux build 2014-03-04 11:18:58 -08:00
Andrew Meadows
1b2db1f7ab fix for warnings about signed/unsigned comparison 2014-03-04 11:07:15 -08:00
Atlante45
9767846c91 fix for windows 2014-03-04 11:06:23 -08:00
Andrew Meadows
c8149f95a3 fix warning for unused variable (we forgot to use it) 2014-03-04 11:06:23 -08:00