Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 01:29:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22698 commits 76 branches 59 tags 1.2 GiB
Commit graph

22698 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
034ceab4d3 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-05 06:39:03 -08:00
Seth Alves
af4957ff14 start to write out obj from vhacd 2015-03-05 06:38:42 -08:00
Seth Alves
ac0c4e8512 cap max speed at MAX_WALKING_SPEED 2015-03-04 19:57:06 -08:00
Seth Alves
ef66182ce7 Merge pull request #4379 from AndrewMeadows/thermonuclear 
fix dark lighting and missing avatars on linux
 2015-03-04 19:00:54 -08:00
Andrew Meadows
d7eaa68193 Merge pull request #4378 from ZappoMan/fixEntitiyImportExport 
fix bug in export
 2015-03-04 17:25:27 -08:00
Seth Alves
7df877ced7 Merge branch 'thermonuclear' of github.com:AndrewMeadows/hifi into avatars-can-collide 2015-03-04 16:56:59 -08:00
Andrew Meadows
c3a4e5d94b fix dark lighting and missing avatars on linux 2015-03-04 16:52:27 -08:00
ZappoMan
e99ffb8307 fix bug in export 2015-03-04 16:29:34 -08:00
Seth Alves
a8b688d540 move _velocity into base class. walking on a cube works 2015-03-04 15:26:02 -08:00
Seth Alves
31624b85e7 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-04 15:08:34 -08:00
Seth Alves
440a4378dd Merge pull request #4376 from ZappoMan/removeMetavoxels 
don't add old metavoxels assignment to default assignments
 2015-03-04 15:08:15 -08:00
Seth Alves
cee39e177c Merge branch 'removeMetavoxels' of github.com:ZappoMan/hifi into avatars-can-collide 2015-03-04 14:50:42 -08:00
ZappoMan
05640290da don't add old metavoxels assignment to default assignments 2015-03-04 14:41:28 -08:00
Seth Alves
910c8da046 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-04 14:19:12 -08:00
Clément Brisset
da6db93508 Merge pull request #4375 from ctrlaltdavid/20370 
More parentheses to address Xcode compiler warnings
 2015-03-04 10:06:54 -08:00
David Rowe
4c959e8d82 More parentheses to address Xcode compiler warnings 2015-03-04 09:17:19 -08:00
Seth Alves
15609a80ec Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-04 08:48:54 -08:00
Seth Alves
b4998e9c53 falling onto an object works 2015-03-04 08:48:48 -08:00
Chris Collins
90c5595bc6 Merge pull request #4374 from birarda/master 
fix for localhost domain-server port check
 2015-03-03 23:31:49 -08:00
Stephen Birarda
3005f74411 fix localhost port check to not kill user lookup 2015-03-03 23:11:02 -08:00
Seth Alves
a254f017cc Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-03 18:37:40 -08:00
Seth Alves
8eec66c066 merge upstream, avatar can now fall onto a cube 2015-03-03 18:37:16 -08:00
Stephen Birarda
0a74291377 Merge pull request #4373 from birarda/remove-xmpp 
fix web chat link for IRC
 2015-03-03 16:26:12 -08:00
Stephen Birarda
d3682b0297 fix web chat link for IRC 2015-03-03 16:03:47 -08:00
Brad Hefta-Gaub
fc048c3b03 Merge pull request #4368 from ctrlaltdavid/20377 
CR for 20377
 2015-03-03 15:51:42 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Brad Hefta-Gaub
9649ed9936 Merge pull request #4371 from huffman/light-radius 
Update Light to set direction when setting orientation
 2015-03-03 15:50:04 -08:00
Seth Alves
7e4b597ca3 keep physics specific code in PhysicsEngine 2015-03-03 15:45:10 -08:00
Clément Brisset
6cefa0d3fb Merge pull request #4370 from birarda/remove-xmpp 
remove xmpp chat from interface
 2015-03-03 15:27:38 -08:00
Seth Alves
5d4ef8d5b8 initial flailing 2015-03-03 14:30:26 -08:00
Ryan Huffman
3fef8a1622 Update Light to set direction when setting orientation 2015-03-03 12:41:51 -08:00
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Stephen Birarda
a961cd8ff3 show link to IRC in place of Qxmpp removal 2015-03-03 12:17:35 -08:00
Brad Hefta-Gaub
b118912708 Merge pull request #4361 from samcake/temp0 
evolve the Transform stack away from the legacy GL to the brand new shader way
 2015-03-03 11:43:01 -08:00
Andrew Meadows
128eb1c48e Merge pull request #4346 from birarda/master 
handle bullet as multi-config on WIN32
 2015-03-03 11:30:52 -08:00
Brad Hefta-Gaub
29340b6586 Merge pull request #4369 from ctrlaltdavid/20370 
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
 2015-03-03 11:17:31 -08:00
Sam Gateau
cad2184927 FIxing the compilation issue for linux 2015-03-03 11:09:11 -08:00
David Rowe
1b34b80b1a Use BrowsC_U to control both brows' up and down 2015-03-03 11:05:59 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users 
Add permission-checking to edit entities
 2015-03-03 11:04:46 -08:00
Sam Gateau
598b791aee FIxing the compilation issue for linux 2015-03-03 11:01:47 -08:00
Sam Gateau
4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-03 10:56:04 -08:00
Clément Brisset
774f54a26b Merge pull request #4352 from birarda/remove-prio 
remove PrioVR integration
 2015-03-03 10:47:02 -08:00
Stephen Birarda
03de43d451 simplify notifications.js after chat removal 2015-03-03 10:22:57 -08:00
Stephen Birarda
cf227b94de remove global services example that leveraged xmpp 2015-03-03 10:17:53 -08:00
Stephen Birarda
a893f11ad7 remove load script from message that used xmpp 2015-03-03 10:17:29 -08:00
Stephen Birarda
27b9b345ca remove ChatWindow includes from DialogsManager 2015-03-03 10:15:34 -08:00
Stephen Birarda
b270297406 remove a missed XmppClient include 2015-03-03 10:14:35 -08:00
Stephen Birarda
379914ce7d modify BUILD for removal of qxmpp 2015-03-03 10:14:13 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
eb8e8e9a62 Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem 
pass more localhost ports via shared memory
 2015-03-03 10:05:24 -08:00