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

64787 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
d60d8fe702
Merge pull request #12498 from vladest/fix_crash_startup 
Search main window by checking object name
 2018-02-26 13:06:10 -08:00
Sam Gondelman
d1d6adf447
Merge pull request #12493 from sethalves/fix-shadows-on-osx-1 
fix osx shadows
 2018-02-26 11:46:43 -08:00
John Conklin II
7d450daaa1
Merge pull request #12397 from hyperlogic/bug-fix/entity-mat-avatar-dual-quaternions 
Bug fix/entity mat avatar dual quaternions
 2018-02-26 11:37:33 -08:00
John Conklin II
4feea929ce
Merge pull request #12449 from misslivirose/fix/atp-collisions 
change default add to world shape for asset browser
 2018-02-26 11:15:01 -08:00
John Conklin II
6316f33282
Merge pull request #12485 from dback2/avatarMotors 
Add dynamic mode for scripted avatar motor
 2018-02-26 11:03:30 -08:00
Anthony J. Thibault
f5fcaae283 Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions 2018-02-26 10:55:44 -08:00
John Conklin II
e586a35d38
Merge pull request #12489 from vladest/fix_table_sort_indicator 
Make sure sort indicator is attached to the right of title
 2018-02-26 10:33:27 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-02-26 10:13:40 -08:00
Anthony J. Thibault
c8af9c6f04 Missing EPSILON 2018-02-26 10:05:15 -08:00
Anthony J. Thibault
0404b722e4 Code review feedback 2018-02-26 10:00:32 -08:00
NissimHadar
c0f20900a0
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix 
Corrected edge case of creating a snapshot with "" as the filename.
 2018-02-26 09:39:16 -08:00
John Conklin II
c227c11aa2
Merge pull request #12475 from ElderOrb/FB12518 
fix for 'help icon in toolbar does not highlight when help window is open'
 2018-02-26 09:35:56 -08:00
Zach Fox
b5c42bfeca
Merge pull request #12480 from zfox23/commerce_extendedCerts_apps 
Commerce: Extended Certificates - Apps!
 2018-02-26 08:24:53 -08:00
vladest
77ef0e05a1 Search main window by checking object name 2018-02-26 13:43:50 +01:00
vladest
62f2ba0dad More intellectual calculation of title positions taking in account actual sort indicator glyph size 2018-02-24 09:32:08 +01:00
Seth Alves
9e156deaab
Merge pull request #12494 from druiz17/one-menu 
Remove the avatarEntitiesBookmark menu option
 2018-02-23 19:02:25 -08:00
Brad Hefta-Gaub
3d54f4d246
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog 
Relax deadlock watchdog
 2018-02-23 17:09:30 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete 
Fix EntityItems not getting destroyed
 2018-02-23 16:17:52 -08:00
David Back
283b5724ba CR changes 2018-02-23 15:02:51 -08:00
David Back
da391564a8 CR changes 2018-02-23 15:01:29 -08:00
David Back
a418129bea simplify to just changing timescales 2018-02-23 15:00:23 -08:00
Dante Ruiz
d0ec84b6c8 remove menu option for booking marking avatar entities 2018-02-23 10:45:59 -08:00
Zach Fox
5ee28297f3 Don't use eventLoop, since that will block the UI 2018-02-23 10:19:00 -08:00
Seth Alves
59bd05aa55 make shadow-related shader compile on osx 2018-02-23 09:22:34 -08:00
Dante Ruiz
d3be1a8a23 Merge branch 'master' of github.com:highfidelity/hifi 2018-02-23 09:20:03 -08:00
vladest
b8102cfbd7 Make sure sort indicator is attached to the right of title 2018-02-23 10:06:16 +01:00
Anthony J. Thibault
0469eafbe4 Switch between dualQuats and matrix skinning based on model entity scale factor. 2018-02-22 18:35:16 -08:00
David Back
ba0ba96d81 undo 2018-02-22 17:54:03 -08:00
ZappoMan
9f68accb30 add menu for testing unresponsive interface 2018-02-22 17:34:00 -08:00
David Back
083e461eb0 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors 2018-02-22 17:20:49 -08:00
David Back
902672f85e add dynamic mode for scripted avatar motor 2018-02-22 17:20:36 -08:00
Zach Fox
249f0568a1 New loader 2018-02-22 17:14:23 -08:00
Zach Fox
e3ccfc9935 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_apps 2018-02-22 16:39:26 -08:00
Zach Fox
f14673bc50 Fixup Checkout for apps 2018-02-22 16:38:38 -08:00
NissimHadar
3150b963c0 Implemented call to abortTask(). 2018-02-22 16:29:58 -08:00
Zach Fox
33f73fef0d YAY! 2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346 It's working! 2018-02-22 16:09:01 -08:00
John Conklin II
730dce31e3
Merge pull request #12444 from zfox23/commerce_extendedCerts_1 
Commerce: Extended Certificate Support, V1
 2018-02-22 15:19:57 -08:00
Stephen Birarda
fc9af39745
Merge pull request #12451 from SimonWalton-HiFi/moc-fixes 
Add #include of Forward.h to AudioMixer.h
 2018-02-22 16:09:24 -07:00
Zach Fox
de0eee52d6 cool 2018-02-22 14:45:32 -08:00
ZappoMan
e9cad947d7 add the deadlock watchdog stats to the stats metaverse checkin data 2018-02-22 14:01:56 -08:00
NissimHadar
bb04f3f533 CR corrections. 2018-02-22 13:57:46 -08:00
Zach Fox
4d2d7fa51f lots of fun initial progress! 2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08:00
Alexander Ivash
c15cf33ca1 12518 - Help icon in toolbar does not highlight when help window is open 2018-02-23 00:36:00 +03:00
Simon Walton
a0a12258bf Merge branch 'master' into moc-fixes 2018-02-22 11:06:53 -08:00
Zach Fox
3d4e6de6ab Quick bugfix 2018-02-22 10:49:11 -08:00
ZappoMan
af4f51ecfb Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog 2018-02-22 10:23:36 -08:00
Nissim Hadar
a843a53427 Improved JSDoc comments. 2018-02-22 10:17:20 -08:00
Liv
478ec48b63
Merge pull request #12463 from misslivirose/fix/edit-bugs 
Fix two bugs with Create Menu
 2018-02-22 09:43:50 -08:00