Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23644 commits 29 branches 0 tags 1.1 GiB
Commit graph

11439 commits

Author SHA1 Message Date
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Brad Hefta-Gaub
b6f670a8d8 Merge pull request #4554 from samcake/yellow 
Better support for Nvidia Optimus Laptop
 2015-03-31 15:56:01 -07:00
Sam Gateau
b4d11e2eb5 Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used 2015-03-31 15:18:59 -07:00
David Rowe
154dacf791 Fix typo 2015-03-31 14:21:56 -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
Sam Gateau
ee4b9a483b found the issue brekaing the render, i didn't do the Blend enable sync properly 2015-03-30 18:04:44 -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
ZappoMan
64fdca7d6d fix no root joint warning 2015-03-30 17:32:42 -07:00
Sam Gateau
ee3ec3fe1a found the issue brekaing the render, i didn't do the Blend enable sync properly 2015-03-30 17:28:58 -07:00
ZappoMan
3475bfb396 fix typos 2015-03-30 17:04:47 -07:00
Andrew Meadows
9b13f186e3 remove character from PhysicsEngine on shutdown 2015-03-30 15:51:58 -07:00
ZappoMan
36657c9473 first cut at script caching 2015-03-30 14:36:48 -07:00
Andrew Meadows
10af59296d Merge pull request #4499 from sethalves/multi-hull-collisions 
Multi hull collisions
 2015-03-30 12:11:56 -07:00
Andrew Meadows
2404fb126f Merge pull request #4527 from sethalves/valgrind 
Valgrind told me to do it
 2015-03-30 11:56:17 -07:00
Seth Alves
186cb1ec7a merge from upstream 2015-03-30 11:28:47 -07:00
Sam Gateau
ab9be0cb41 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-30 10:11:08 -07:00
Sam Gateau
2a58a65a8f back to the office monday morning, State almost working in the full piupeline 2015-03-30 10:10:39 -07:00
Seth Alves
7de15cda87 quiet compiler 2015-03-30 09:30:13 -07:00
Philip Rosedale
099a2b5319 Merge pull request #4521 from ctrlaltdavid/20416 
CR for Job #20416 - Update notification.js to include a notification about being blocked from a server
 2015-03-30 08:49:29 -07:00
ZappoMan
3bda65f4fe if installing a body, and you have no head, make your head the default head 2015-03-28 19:19:11 -07:00
ZappoMan
80df8caefb Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-03-28 18:43:03 -07:00
Seth Alves
fc1e45fc58 valgrind says this is used before it's initialized 2015-03-28 17:10:46 -07:00
Seth Alves
986bc71e93 quiet compiler 2015-03-28 17:10:26 -07:00
ZappoMan
002fba8018 first cut at predicting FST type for set avatar 2015-03-27 16:56:03 -07:00
ZappoMan
baa2f947e5 classifying FSTReader and moving ModelType into that class 2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-27 15:55:20 -07:00
Philip Rosedale
d908b7fdc6 Merge pull request #4523 from AndrewMeadows/inertia 
enable avatar physics by default
 2015-03-27 14:53:40 -07:00
Grayson Stebbins
0fd17b3303 editEntities.js --> edit.js 2015-03-27 14:40:16 -07:00
Andrew Meadows
5b85a2aa44 merge upstream/master into andrew/inertia 2015-03-27 13:56:54 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
ZappoMan
6189926105 add type hint to FST in model packager 2015-03-27 13:23:29 -07:00
Philip Rosedale
6550b4e311 Merge pull request #4509 from AndrewMeadows/inertia 
character transitions into "hover" when stepping over abyss
 2015-03-27 13:16:36 -07:00
David Rowe
90c1da2094 Merge branch 'master' into 20416 
Conflicts:
	examples/notifications.js
 2015-03-27 12:13:29 -07:00
Brad Hefta-Gaub
2255c30d58 Merge pull request #4512 from Atlante45/ordered_fst 
Hint order for FST files
 2015-03-27 09:41:50 -07:00
Andrew Meadows
e75bb3cd9c merge upstream/master into andrew/inertia 2015-03-27 08:14:36 -07:00
Stephen Birarda
647e2d7829 Merge pull request #4517 from ZappoMan/menuCleanup 
menu and display tweaks at Philip's request
 2015-03-26 20:06:16 -07:00
Andrew Meadows
821ac605f5 smoother motion on steps 
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
 2015-03-26 19:48:52 -07:00
Seth Alves
16875338bf Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-26 18:55:43 -07:00
Seth Alves
7da87d6e15 set up a way to request ResourceCache downloads from a non-networking thread. 2015-03-26 18:37:55 -07:00
Stephen Birarda
ba82436d95 add user heartbeat if they choose not to send location 2015-03-26 16:50:40 -07:00
ZappoMan
6cff99f9d6 menu and display tweaks 2015-03-26 16:36:46 -07:00
Atlante45
716e9bfe4f Hint order for FST files 2015-03-26 15:40:48 +01:00
ZappoMan
9e34dda7c9 Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks 2015-03-25 16:54:37 -07:00
Brad Hefta-Gaub
918154e407 Merge pull request #4491 from huffman/export-json 
Update export entities to export as JSON
 2015-03-25 16:49:23 -07:00
ZappoMan
c031ce15a7 dead code 2015-03-25 16:45:51 -07:00
ZappoMan
19feeacc51 dead code 2015-03-25 16:38:57 -07:00
ZappoMan
f46067b634 better tracking of being done with downshifting 2015-03-25 16:30:33 -07:00
Clément Brisset
b81e89ad3d Merge pull request #4488 from ctrlaltdavid/20407 
CR for 20407 - Make Sixense emulate mouse only if controllers aren't at the base
 2015-03-26 00:24:17 +01:00
ZappoMan
68e730af45 handle throttle render case and clean up code logic to be more obvious 2015-03-25 15:48:50 -07:00