Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 09:15:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3004 commits 76 branches 59 tags 1.2 GiB
Commit graph

3004 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
6b854531aa Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 14:31:46 -07:00
birarda
9ec04855f8 Merge pull request #386 from ZappoMan/voxel_animation 
Fix some crashing issues on delete
 2013-05-22 14:27:29 -07:00
ZappoMan
ccd4f5e002 CR feedback 2013-05-22 14:25:25 -07:00
ZappoMan
c2ebd6fc95 CR feedback 2013-05-22 14:23:27 -07:00
ZappoMan
47c4ff887e CR feedback 2013-05-22 14:13:38 -07:00
ZappoMan
cb96b34f9a CR feedback 2013-05-22 14:08:18 -07:00
ZappoMan
ea1916ee62 fix coding standard issues 2013-05-22 14:07:08 -07:00
Philip Rosedale
f8c39a8617 Merge pull request #382 from ey6es/master 
Support for multiple environments, each with their own gravity (and currently, collision spheres).
 2013-05-22 14:04:28 -07:00
ZappoMan
59609b37a0 fix coding standard issues 2013-05-22 14:03:41 -07:00
ZappoMan
ce30f1612b fix coding standard issues 2013-05-22 14:02:49 -07:00
ZappoMan
d1776cc5da fix coding standard issues 2013-05-22 14:02:13 -07:00
ZappoMan
4b8022c64e fix coding standard issues 2013-05-22 13:59:21 -07:00
ZappoMan
3e37c956c6 fix coding standard issues 2013-05-22 13:57:33 -07:00
Philip Rosedale
ad8246a0f5 Turned log off by default 2013-05-22 13:46:39 -07:00
ZappoMan
cd1f07231f fix CR issues 2013-05-22 13:40:59 -07:00
ZappoMan
0c90a5f6b0 fix CR issues 2013-05-22 13:39:29 -07:00
ZappoMan
fe62ed9844 fix CS issues 2013-05-22 13:38:09 -07:00
ZappoMan
ee0ceb8516 fix CS issues 2013-05-22 13:36:06 -07:00
ZappoMan
eb7df9b499 fix whitespace 2013-05-22 13:32:40 -07:00
ZappoMan
06f2528d6a fix crashing on deleting voxels in server and client 2013-05-22 13:23:01 -07:00
ZappoMan
cbd3497c5c Merge pull request #385 from birarda/master 
non-DRY fix for resources copy on OS X
 2013-05-22 13:18:34 -07:00
Stephen Birarda
62cf452e3d non-DRY fix for correct copy of resources for OS X bundle 2013-05-22 13:16:55 -07:00
Philip Rosedale
fd9f600421 Merge pull request #384 from PhilipRosedale/master 
moved include stdint to header file
 2013-05-22 13:11:55 -07:00
Philip Rosedale
e411b41be7 oops moving stdint to header file 2013-05-22 13:02:07 -07:00
Philip Rosedale
a55def02f3 Merge pull request #383 from PhilipRosedale/master 
Fix linux build, pair to own menu
 2013-05-22 12:57:21 -07:00
Philip Rosedale
a03d6f8d80 moved pair to own menu 2013-05-22 12:55:46 -07:00
Philip Rosedale
bcf13b9754 hopefully fix linux broken build by including stdint in transmitter 2013-05-22 12:48:36 -07:00
Philip Rosedale
b95560587a pitch force 4x bigger in transmitter 2013-05-22 12:42:28 -07:00
Stephen Birarda
b0ff1029f6 Merge branch 'master' of github.com:worklist/hifi 2013-05-22 12:40:48 -07:00
Stephen Birarda
0fdbfe8ea8 move gen_stars to the tools folder 2013-05-22 12:39:27 -07:00
Philip Rosedale
4ad2f9a943 Merge pull request #381 from Geenz/19319 
Code Review for Job #19319
 2013-05-22 12:32:47 -07:00
ZappoMan
dfe7008a35 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-22 12:00:46 -07:00
ZappoMan
6733d83f2d Merge pull request #379 from PhilipRosedale/master 
Sensor fusion to better stabilize transmitter roll, pitch
 2013-05-22 12:00:08 -07:00
Philip Rosedale
53dc81e309 Fixes per code review. 2013-05-22 11:57:11 -07:00
Andrzej Kapolka
0e7c0e08eb Since we're not using deltaTime (yet), don't pass it as a parameter (yet). 2013-05-22 11:29:46 -07:00
Andrzej Kapolka
f70b2ceb76 Reverted change that would have added glm to shared library. 2013-05-22 11:23:55 -07:00
Andrzej Kapolka
ada32f1a8b Added back "floor," "bounce." 2013-05-22 11:08:04 -07:00
Andrzej Kapolka
8152416d6f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 10:54:52 -07:00
Andrzej Kapolka
7e5418f8db Fix for default environment, better capsule placement. 2013-05-22 10:53:58 -07:00
Geenz
fb553fce80 Refactor startup timing a little by getting the current time the moment the application enters its main function, then passing that to Application's constructor. Also fix the titlebar bug by setting the title bar at the end of initializeGL() instead of at the end of the first frame (which would actually further the inaccuracy of the startup time). 2013-05-22 10:53:35 -04:00
Philip Rosedale
0d231b5550 Added lift to transmitter with finger, for true god-like flight! 2013-05-21 23:24:58 -07:00
ZappoMan
a8c4e928b8 Merge pull request #380 from ZappoMan/master 
build buster fix?
 2013-05-21 23:11:43 -07:00
ZappoMan
a311e40f25 hopefully fix unix build buster 2013-05-21 23:10:57 -07:00
Philip Rosedale
2edd085941 Added sensor fusion with gravity to transmitter to stabilize drift offset in pitch and roll. 2013-05-21 22:40:13 -07:00
Andrzej Kapolka
8d255f7685 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:38:23 -07:00
Andrzej Kapolka
c7e840e0d4 The end parameter to glDrawRangeElements is inclusive. 2013-05-21 22:36:27 -07:00
Andrzej Kapolka
8b1362636e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master 
refactors logging, adds comments, and revises names & formatting in all submitted code
 2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6 Support for multiple environments, collisions with notional planet surfaces. 2013-05-21 21:33:08 -07:00