Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76374 commits 71 branches 56 tags 1.2 GiB
Commit graph

76374 commits

This branch
This branch
All branches
Author SHA1 Message Date
amer cerkic
8d522d9ce7 fixed issues with pause/resume and start/stop. still issues with input after resume 2019-02-14 14:48:56 -08:00
Shannon Romano
453c081d9b
Merge pull request #14901 from huffman/fix/dropdown-close-on-click 
Case 19999: Update edit.js to auto close dropdowns when clicking outside
 2019-02-14 14:48:03 -08:00
NissimHadar
cf2e118c14 Added missing double-quote. 2019-02-14 14:33:49 -08:00
raveenajain
01def37efd spacing 2019-02-14 14:22:43 -08:00
NissimHadar
a1e289cc1c Compilation error on Qt 5.12 2019-02-14 14:17:29 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
NissimHadar
90aff53408 Merge branch 'master' of github.com:highfidelity/hifi into 21193-updateNitpickReadme 2019-02-14 13:47:16 -08:00
NissimHadar
ba68421d0c Completed manual. 2019-02-14 13:46:51 -08:00
NissimHadar
705a0bcaa0 Updated manual to include Android. 2019-02-14 13:41:54 -08:00
SamGondelman
bed2732d34 start moving materials to rendering only 2019-02-14 12:59:16 -08:00
Brad Davis
292602afd7 Resolving more master differences 2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -08:00
Sam Gateau
969c62d0df
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac 
Case 21157: Fix Desktop.qml crash on local mac build
 2019-02-14 12:15:50 -08:00
Sam Gateau
384d4fb959
Merge pull request #14809 from highfidelity/commandLineAndroid 
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
 2019-02-14 12:10:08 -08:00
raveenajain
e825be566d Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_tangents 2019-02-14 11:45:53 -08:00
David Back
4e4ec9940f copy external texture dependencies 2019-02-14 11:38:39 -08:00
John Conklin II
5e177c31ee
Merge pull request #14912 from NissimHadar/21185-protectNitpickFromBadFilename 
Case 21185: protect nitpick from bad filename
 2019-02-14 11:25:36 -08:00
David Rowe
6a00834147 Merge branch 'master' into M21128 
# Conflicts:
#	interface/src/AboutUtil.h
 2019-02-15 08:06:41 +13:00
David Rowe
d717e803dd WalletScriptingInterface API JSDoc 2019-02-15 08:00:53 +13:00
David Rowe
cc083afec6 HifiAbout API JSDoc 2019-02-15 08:00:36 +13:00
David Rowe
2a338124ae AccountServices API JSDoc 2019-02-15 08:00:19 +13:00
NissimHadar
6752092899 Removed unnecessary member variable. 2019-02-14 10:38:19 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Thijs Wenker
3026fd625a Avatar Doctor 2019-02-14 18:52:50 +01:00
NissimHadar
701c18c9eb Correction to recursive scripts. 2019-02-14 08:58:09 -08:00
Angus Antley
1924018d2c added code to convert theta to a projected pole vector 2019-02-14 07:15:58 -08:00
Sam Gateau
8fdf0fb80c Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-13 22:33:48 -08:00
NissimHadar
58c0078188 Reversed order of recursive calls. 2019-02-13 21:07:25 -08:00
NissimHadar
301b4215e5 Fixed gcc warning. 2019-02-13 19:13:08 -08:00
Angus Antley
aa0c52abd7 fixed wrap around 180 degrees 2019-02-13 18:33:01 -08:00
NissimHadar
be5f9b211b Add nitpick to production (but not stable) builds 2019-02-13 18:09:06 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal 
Case 21147, Case 20944: Fix setTextures (pal, etc.)
 2019-02-13 17:50:08 -08:00
Sam Gateau
bd3a732cdc Introducing msaa to forward renderer 2019-02-13 17:38:59 -08:00
amantley
fc978f0ee7 fixed twist angle bug. need to fix wrap around 180 to -180 behaviour 2019-02-13 17:31:48 -08:00
Andrew Meadows
72b5fa1968
Merge pull request #14857 from Atlante45/fix/ess-parenting 
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
 2019-02-13 17:26:57 -08:00
amantley
c6da7cc41d everything looks pretty good now but need to move the code to rig and need to get rig of wrap around problem with the twist decomp 2019-02-13 17:12:28 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
SamGondelman
3f8bfc5475 CR and fix deadlock 2019-02-13 16:19:39 -08:00
raveenajain
a967d7a1bc tangent attribute 2019-02-13 15:59:55 -08:00
SamGondelman
9e002c59d4 fix pal 2019-02-13 15:24:55 -08:00
NissimHadar
56483f4884 Check that zipped folder name is in correct format. 2019-02-13 15:18:07 -08:00
NissimHadar
86aaba016f Narrow filter on zip folder selection. 2019-02-13 15:15:46 -08:00
NissimHadar
12c122ce9c Bump up version number. 2019-02-13 15:14:36 -08:00
NissimHadar
77b679606f Corrected bug in zip folder name. 2019-02-13 15:13:55 -08:00
danteruiz
562e159ab4 the proper fix for browser qml issues 2019-02-13 10:45:07 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132 
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
 2019-02-13 10:35:00 -08:00
Andrew Meadows
ba91bab224 remove cruft 2019-02-13 10:05:32 -08:00
Andrew Meadows
c79e3e5a6d add some trace contexts for easier debugging 2019-02-13 10:02:58 -08:00
Andrew Meadows
152edd477c change trace context to rendering 2019-02-13 10:00:51 -08:00
Shannon Romano
6ca4a2776e
Merge pull request #14903 from NissimHadar/21129-improveNitpickUsability 
Case 21129: improve nitpick usability
 2019-02-13 09:54:53 -08:00