Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 03:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20398 commits 71 branches 56 tags 1.2 GiB
Commit graph

20398 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
53f24954e0 Updates based on PR comments 
Commented out Camera.stopLooking and Camera.keepLookingAt . This can be
put back when we merge back the C++ issue.
 2015-01-07 11:15:30 -08:00
Chris Collins
816e369c08 More Script updates 
More Script updates
 2015-01-06 22:32:45 -08:00
Philip Rosedale
3ed5b0e9be Merge pull request #4052 from cozza13/20253 
CR for Job #20253 - Fix scripts that still link to highfidelity-public
 2015-01-06 17:08:51 -08:00
Chris Collins
0a1a64b7e6 Script updates and fixes to highfidelity-public 
Script updates and fixes to highfidelity-public
 2015-01-06 17:04:42 -08:00
Philip Rosedale
a600069c65 Merge pull request #4048 from cozza13/20251 
CR for Job #20251 - Tidy up script within the example folder
 2015-01-06 16:59:51 -08:00
Clément Brisset
fb6fb8a38d Merge pull request #4050 from birarda/lasagna-not-spaghetti 
put back current address storage in Menu
 2015-01-06 16:29:52 -08:00
Stephen Birarda
9c191be106 use the AddressManager's method to store current address 2015-01-06 16:13:06 -08:00
Stephen Birarda
8c8a925085 put back current address storage in Menu 2015-01-06 16:06:07 -08:00
Chris Collins
c3d151a646 Merge branch '20251' into 20253 2015-01-06 16:05:06 -08:00
Stephen Birarda
1d7f1de883 Merge pull request #4047 from birarda/master 
some fixes to domain-server settings
 2015-01-06 16:04:14 -08:00
Chris Collins
95f8447191 Incremental update to scripts cleanup 
-Moved more of the scripts around
-Fixed up the location on assets on start. e.g. gun.js
-Removed additional Scripts.
 2015-01-06 15:47:25 -08:00
Stephen Birarda
2103e0150f fix for row removal in domain array settings 2015-01-06 15:42:01 -08:00
Stephen Birarda
51c175d160 put input default back after row add 2015-01-06 15:30:38 -08:00
Stephen Birarda
98079faafd Merge pull request #4046 from highfidelity/cozza13 
@cozza13 doesn't know how branches work - here is his PR for moving scripts to examples
 2015-01-06 11:26:17 -08:00
Chris Collins
602275a0f7 First pass moving scripts into an example folder. 
This is just a quick first pass to move some of the scripts into an
examples folder. There are also a couple of obvious deletions.
 2015-01-06 11:16:40 -08:00
Philip Rosedale
03dfd923a0 Merge pull request #4045 from Atlante45/fix_hidden_mouse_windows 
Fix mouse disappearing in the menus on Windows
 2015-01-06 10:58:13 -08:00
Atlante45
9d5ff5d274 Fix mouse disappearing in the menus on Windows 2015-01-06 10:36:42 -08:00
Chris Collins
7f15acacbf Merge branch 'master' into cozza13 2015-01-06 10:30:23 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
ZappoMan
b605fe387e fix ui file 2015-01-06 09:55:49 -08:00
Andrew Meadows
9be3733b23 Merge pull request #4044 from birarda/lasagna-not-spaghetti 
remove doubled friend declarations
 2015-01-06 09:52:31 -08:00
Stephen Birarda
5fadfa8c17 remove doubled friend declaration, is in macro 2015-01-06 09:35:11 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
Andrew Meadows
f3255eeb0e Merge pull request #4008 from birarda/lasagna-not-spaghetti 
some Audio cleanup in prep for audio untangle
 2015-01-06 09:13:12 -08:00
Brad Hefta-Gaub
a88346467b Merge pull request #4042 from samcake/tot 
Change sun location to be the direction for lighting
 2015-01-05 20:36:28 -08:00
Brad Hefta-Gaub
21e3687678 Merge pull request #4041 from AndrewMeadows/inertia 
Include damping in model of remote extrapolation
 2015-01-05 20:36:14 -08:00
Andrew Meadows
278be3d31b remove use of "radius" property for entities 
use "dimensions" instead
 2015-01-05 18:13:50 -08:00
Sam Gateau
4ffb3e4e7e just do the sun location modification 2015-01-05 17:31:47 -08:00
Andrew Meadows
0a8437a578 increasing default restitution to 0.5 2015-01-05 17:31:23 -08:00
Andrew Meadows
ec86f0bd50 fixing toyball.js to work under Bullet 2015-01-05 17:30:50 -08:00
Sam Gateau
2fdcbb1a97 changing the atmoshpere position 2015-01-05 16:46:42 -08:00
Andrew Meadows
cf235705da mention Bullet in BUILD.md dependencies 2015-01-05 15:29:02 -08:00
Stephen Birarda
f116d0bf5d block until audio IO stops on app quit 2015-01-05 15:20:36 -08:00
Andrew Meadows
e2884c56f5 only predict remote transform for moving objects 2015-01-05 15:16:03 -08:00
Andrew Meadows
11de33b98b merge upstream/master into andrew/inertia 2015-01-05 15:02:53 -08:00
Andrew Meadows
75a8faec86 purge support for voxels from PhysicsEngine 2015-01-05 15:02:18 -08:00
Sam Gateau
56758759e5 making the sun position a direction 2015-01-05 15:02:12 -08:00
Andrew Meadows
244a8503ef include damping in remote extrapolation model 2015-01-05 14:48:16 -08:00
Stephen Birarda
dbe4b6ccc0 include QDesktopServices in UpdateDialog 2015-01-05 14:45:41 -08:00
Stephen Birarda
9bcacaf512 put back declared constructor, inputReceived signal 2015-01-05 14:43:23 -08:00
Stephen Birarda
53ac1a2bb2 don't include QtGui from UpdateDialog 2015-01-05 14:41:38 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Brad Hefta-Gaub
b385fe9679 Merge pull request #4040 from samcake/tot 
Add the animated and moving entities to the shadow map
 2015-01-05 14:23:07 -08:00
Sam Gateau
f03b253260 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Sam Gateau
901ea16ba0 clean code 2015-01-05 13:17:12 -08:00
Sam Gateau
3e4cbfd2dc clean code 2015-01-05 13:12:28 -08:00
Brad Hefta-Gaub
125dc5010e Merge pull request #4039 from AndrewMeadows/inertia 
Bullet physics part 2
 2015-01-05 13:10:55 -08:00
Sam Gateau
7529b3d1b0 clean code 2015-01-05 13:10:32 -08:00
Ryan Huffman
c5e42aa50e Merge pull request #4035 from ZappoMan/audioStarvation 
add audio starvation detection
 2015-01-05 13:05:27 -08:00