Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 11:32:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23630 commits 75 branches 59 tags 1.2 GiB
Commit graph

23630 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley Austin Davis
eb816f7f6a Adding support for eye per frame mode and offscreen render scaling 2015-03-31 18:24:58 -07:00
Bradley Austin Davis
a7eebfd002 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-31 15:42:01 -07:00
Philip Rosedale
63fe49c60e Merge pull request #4534 from birarda/master 
don't use DX11 for bullet even if found
 2015-03-31 15:21:29 -07:00
Bradley Austin Davis
6757dfcc0c Working on 0.5.0.1 port and addressing the direct HMD/v-sync conflict 2015-03-31 14:52:21 -07:00
Seth Alves
07493432da Merge pull request #4550 from ctrlaltdavid/fix-typo 
Fix typo
 2015-03-31 14:51:28 -07:00
David Rowe
154dacf791 Fix typo 2015-03-31 14:21:56 -07:00
Stephen Birarda
3ed097ff86 Merge pull request #4548 from AndrewMeadows/inertia 
fix typo that broke avatar motion
 2015-03-31 13:42:20 -07:00
Stephen Birarda
e5637a1f28 Merge pull request #4547 from ZappoMan/preloadOnImport 
fix issue with preload not being called on import
 2015-03-31 13:31:13 -07:00
Bradley Austin Davis
c4c6cf82a2 Working on migration to SDK 0.5.0.1 2015-03-31 13:27:11 -07:00
Andrew Meadows
9739d68370 fix typo that broke avatar motion 2015-03-31 13:20:06 -07:00
Brad Hefta-Gaub
434349d947 Merge pull request #4541 from ctrlaltdavid/20428 
CR for Job #20428 - Add the ability to minimize/maximize users.js
 2015-03-31 13:09:46 -07:00
Brad Hefta-Gaub
e27a89b7c3 Merge pull request #4539 from birarda/settings-thread-delete-later 
fix for cleanup of SettingsManager thread
 2015-03-31 13:09:06 -07:00
Brad Hefta-Gaub
672d95cac6 Merge pull request #4546 from huffman/edit-tab-select 
Fix edit.js not selecting all when tabbing between properties
 2015-03-31 12:50:39 -07:00
ZappoMan
df99c314aa fix issue with preload not being called on import 2015-03-31 12:44:44 -07:00
Stephen Birarda
d55ae62459 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-31 12:34:47 -07:00
Bradley Austin Davis
677e2b1e6b Merge branch 'master' into oculus_old_renderer 2015-03-31 11:23:03 -07:00
Philip Rosedale
971108494a Merge pull request #4544 from AndrewMeadows/inertia 
fix for intermittent crash on Windows during login
 2015-03-31 11:19:08 -07:00
Bradley Austin Davis
56b5ad2e6b Merge branch 'master' into oculus_old_renderer 2015-03-31 11:10:23 -07:00
Ryan Huffman
79305141d1 Fix edit.js not selecting all when tabbing between properties 2015-03-31 10:51:07 -07:00
andrew
a2b5fdb540 merge 2015-03-31 09:28:23 -07:00
andrew
fdfb8bd1b4 fix intermittent crash on windows during login 2015-03-31 09:26:33 -07:00
Andrew Meadows
f1b1ed014b merge upstream/master into andrew/inertia 2015-03-31 08:33:31 -07:00
Philip Rosedale
0c9e6ad3c0 Merge pull request #4543 from stojce/20397 
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
 2015-03-31 08:13:54 -07:00
Philip Rosedale
9ab87fdcba Merge pull request #4537 from sethalves/vhacd-knobs 
Vhacd improvements, quads in collision hulls, fix dice
 2015-03-31 07:32:59 -07:00
Seth Alves
c8e623ace7 remove some debugging prints, added some comments 2015-03-31 07:18:20 -07:00
Seth Alves
52fc75a114 merge upstream 2015-03-31 07:18:04 -07:00
Philip Rosedale
4961cf37b6 Merge pull request #4540 from ZappoMan/scriptCaching 
quiet warning flood when scripts are bad
 2015-03-30 21:48:13 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI 
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
 2015-03-30 21:31:22 -07:00
David Rowe
495b62b356 Add minimized state 2015-03-30 20:46:39 -07:00
David Rowe
622f10bd25 Add minimize button 2015-03-30 20:46:38 -07:00
ZappoMan
a88b3c02d2 quiet warning flood when scripts are bad 2015-03-30 18:24:34 -07:00
Stephen Birarda
7d5b8c430a remove extra added space 2015-03-30 18:06:51 -07:00
Stephen Birarda
1cb12bd1da Merge branch 'master' of https://github.com/highfidelity/hifi into settings-thread-delete-later 2015-03-30 18:03:35 -07:00
Stephen Birarda
b7174b5170 fix for cleanup of SettingsManager thread 2015-03-30 18:03:18 -07:00
Andrew Meadows
b8ff253f86 unlock after character is properly updated 2015-03-30 18:03:18 -07:00
Andrew Meadows
bdfe75b1f5 remove character from PhysicsEngine on shutdown 2015-03-30 18:03:18 -07:00
Seth Alves
63a59aa00a fix a couple of crashes 2015-03-30 18:03:18 -07:00
Philip Rosedale
ce05d3104a Merge pull request #4535 from ZappoMan/scriptCaching 
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
 2015-03-30 18:02:52 -07:00
Brad Hefta-Gaub
e1da9331e3 Merge pull request #4533 from jherico/tr2 
Fixing consecutive spaces issue with text renderer
 2015-03-30 17:34:42 -07:00
ZappoMan
0366ce9bf5 removed dead code 2015-03-30 17:33:25 -07:00
ZappoMan
64fdca7d6d fix no root joint warning 2015-03-30 17:32:42 -07:00
Andrew Meadows
94c1cf12f5 deleting _dynamicsWorld doesn't crash on shutdown 2015-03-30 17:12:19 -07:00
Philip Rosedale
5cd031739b Merge pull request #4536 from PhilipRosedale/master 
Fix error with angular speed
 2015-03-30 17:07:22 -07:00
Seth Alves
acf30782b6 include quads in creation of hulls for physics collision. visual model vs collision model debug spew. fix dice script 2015-03-30 17:04:47 -07:00
ZappoMan
3475bfb396 fix typos 2015-03-30 17:04:47 -07:00
Philip Rosedale
63c1bdd0a8 Fix error with angular speed 2015-03-30 17:03:09 -07:00
ZappoMan
31072b2b2e only start one download per url even if still pending 2015-03-30 16:48:41 -07:00
Stephen Birarda
79ef05831d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-30 16:44:33 -07:00
Stephen Birarda
a308eb2e2f don't use DX11 for bullet even if found 2015-03-30 16:44:10 -07:00
Bradley Austin Davis
5e5bdec88d Merge branch 'master' into oculus_old_renderer 2015-03-30 16:36:00 -07:00