Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 22:55:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
73357 commits 71 branches 56 tags 1.2 GiB
Commit graph

623 commits

Author SHA1 Message Date
unknown
08d9eda7d7 fix property bugs / style issues 2018-11-09 17:08:10 -08:00
David Back
615ffebb2c new draggable numbers WIP 2018-11-09 13:14:05 -08:00
Ryan Huffman
44d0a7254c Update the styling for the Entity Properties window 2018-11-08 16:36:55 -08:00
Jeff Clinton
d349c1e672
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles 
Fix horizontal and vertical props in entity properties being swapped
 2018-11-08 12:42:48 -08:00
Jeff Clinton
30ff3f676a
Merge pull request #14310 from thoys/fix/create/tooltips-refinement 
Create APP tooltip / Adressed CR comments / Regression
 2018-11-08 10:03:17 -08:00
Howard Stearns
03ac18ab74
Merge pull request #14299 from davidkelly/dk/19591 
Don't attempt purchase of sold out items
 2018-11-05 16:20:02 -08:00
howard-stearns
8ad8398ef3 remove 'purchase' from login notice. 2018-11-04 11:17:56 -08:00
Ryan Huffman
c22df4dd94 Fix horizontal and vertical props in entity properties being swapped 2018-11-02 16:22:10 -07:00
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
Zach Fox
4a56f769e5 Re-add some code I shouldn't have removed 2018-11-01 11:04:59 -07:00
Zach Fox
34fb849536 Cleanup FIXME 2018-10-31 13:53:18 -07:00
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
David Kelly
015b5fa681 Don't attempt purchase of sold out items 2018-10-30 08:01:22 -07:00
Zach Fox
d47fd44a47 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-29 14:57:23 -07:00
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix 
Fix Collides With subproperties
 2018-10-26 13:46:52 -07:00
David Back
13acfb325a fix collides with properties, fix ordering for start/finish/spread properties 2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips 
MS19052 [CreateApp]: Tooltips
 2018-10-25 14:52:16 -07:00
Howard Stearns
8b79795247 nix the word "purchase" where possible 2018-10-25 12:31:01 -07:00
Howard Stearns
6284c902be use the switch 2018-10-25 11:29:10 -07:00
SamGondelman
faff5f11e8 Merge remote-tracking branch 'upstream/master' into particleLoad 2018-10-25 10:56:11 -07:00
Thijs Wenker
83051940a8 Fix QA feedback 2018-10-25 02:46:15 +02:00
Thijs Wenker
358b0b76d1 tooltip delay of 500ms 2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa property tooltips 2018-10-25 02:46:14 +02:00
David Back
a88678fb70 fix bad css merge, add particle property debounce 2018-10-24 15:07:47 -07:00
David Back
5c1972e3f4 fix fallback properties 2018-10-24 12:40:44 -07:00
Howard Stearns
e1e9b78427 filter priced items from marketplace 2018-10-24 12:22:03 -07:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
Howard Stearns
8ee6a0ceff disable priced items 2018-10-24 11:37:02 -07:00
David Back
073040d1fc
Merge branch 'master' into entityListTypeFilter 2018-10-24 10:39:30 -07:00
Ryan Huffman
6221b9ee59
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll 
MS19054: [CreateApp/EntityList] auto scroll
 2018-10-24 10:36:21 -07:00
Thijs Wenker
5f35a32480 remove duplicate calls to refresh footer 2018-10-24 17:58:07 +02:00
Thijs Wenker
8e1cfb5a06 fix double click selection 2018-10-24 17:58:07 +02:00
Thijs Wenker
776b8b8fc7 CR and style fixes 2018-10-24 17:58:06 +02:00
Thijs Wenker
27e0c85b01 entity list auto scroll 2018-10-24 17:58:06 +02:00
David Back
2b9dcd0875 fix particle properties and keylight direction, remove columns, fix orderings, fix sliders 2018-10-23 18:38:05 -07:00
Thijs Wenker
3fa4ee0e1d enable duplicate copy cut paste functionality of context menu 2018-10-23 22:42:55 +02:00
Thijs Wenker
4069ca2e0c CR feedback 2018-10-23 22:42:55 +02:00
Thijs Wenker
e5ef589a3c style 2018-10-23 22:42:54 +02:00
Thijs Wenker
4c3f5b3bbc Entity List Context Menu 2018-10-23 22:42:54 +02:00
Howard Stearns
95b86bf5b7 initial limited commerce for oculus store prototype 2018-10-23 13:08:39 -07:00
David Back
9afb111fbe add link, fix group order 2018-10-22 18:42:06 -07:00
David Back
d5dc93e800 QA fixes and reset server script status 2018-10-22 18:31:21 -07:00
David Back
e5caf01681 CR change for body click event 2018-10-22 14:51:54 -07:00
David Back
ddbe02dd4e CR changes and fix extra info toggle 2018-10-22 11:56:47 -07:00
David Back
76dbee265e Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-19 16:05:04 -07:00
David Back
e59f1516ef CR changes 2018-10-19 16:01:53 -07:00
David Back
11add70ef2 style tweaks 2018-10-18 14:58:51 -07:00
Seth Alves
7f150e6ed3 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-18 09:53:18 -07:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor 2018-10-17 20:01:15 -07:00