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

59 commits

Author SHA1 Message Date
Sam Gondelman
ccdf1c8614
Merge branch 'master' into NOverlays4 2018-12-07 14:27:34 -08:00
Ryan Huffman
bf844e0472 Add hiding of certified properties in Create 2018-12-07 11:05:52 -08:00
SamGondelman
3ce6f7f3d6 real image entities 2018-12-03 11:50:59 -08:00
Thijs Wenker
e89346c146 making rename functionality list refresh proof 2018-11-16 22:10:14 +01:00
Thijs Wenker
e890228fc7 Make shortcuts work in edit windows 2018-11-14 01:05:36 +01:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Thijs Wenker
08da8c4190 createApp - world/local switch 2018-11-09 01:28:37 +01:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08: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
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
Thijs Wenker
4e9f9b3edf comply with copy/paste update 2018-10-23 22:42:56 +02:00
Thijs Wenker
3fa4ee0e1d enable duplicate copy cut paste functionality of context menu 2018-10-23 22:42:55 +02:00
Thijs Wenker
4c3f5b3bbc Entity List Context Menu 2018-10-23 22:42:54 +02:00
Thijs Wenker
d1f35c8c54 update the entityList update with newly added Entities.getMultipleEntities function 2018-09-20 22:48:56 +02:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
Ryan Huffman
5aa5552727 Fix PROFILE not forwarding calls when disabled 2018-09-10 14:07:25 -07:00
Ryan Huffman
3cc90d3c80 Disable profiling in entityList.js 2018-09-07 12:07:19 -07:00
Ryan Huffman
739530cb85 Limit Entity List to only getting the properties it needs 2018-09-05 14:30:36 -07:00
Ryan Huffman
a9a5bf1e97 Replace entity list UI with custom, brute-force solution 2018-09-05 14:30:19 -07:00
Ryan Huffman
f6ac755bae Add profiling to edit.js fof the entity list 2018-09-05 14:30:19 -07:00
Ryan Huffman
133ac0662a Move entity list qml to scripts dir 2018-09-05 14:30:19 -07:00
Thijs Wenker
876079bb81 deactivate Create App when desktop windows are closed 2018-08-11 00:41:50 +02:00
Dante Ruiz
269afb9a49 remove tablet material entities code remove create 2018-08-07 11:19:22 -07:00
Seth Alves
a6a4dd3b8e
Merge pull request #13570 from danteruiz/fix-tablet-material-entities 
clean up tablet material entities  and don't display them in create menu
 2018-07-23 09:50:23 -07:00
Thijs Wenker
09e1090e72 Use create app in tablet mode when choosing to use tablet in desktop mode 2018-07-17 17:33:13 +02:00
unknown
306a77c039 fix delete event 2018-07-12 12:46:18 -07:00
Dante Ruiz
df4d81277f clean up tablet material entities and don't show them in edit 2018-07-09 16:59:32 -07:00
Thijs Wenker
b1884b0841 CR fixes 2018-07-09 16:38:53 +02:00
Thijs Wenker
42afd31325 default window width fixes 2018-07-06 19:48:35 +02:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows 
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
 2018-07-03 18:47:38 +02:00
John Conklin II
94ab0c71b2
Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427 
[BugFix] EntityList UncaughtException in that.sendUpdate
 2018-07-02 12:35:20 -07:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Rowe
1b99946c5f Fix entity not highlighted in list after creating or undoing delete 2018-05-02 12:38:29 +12:00
LaShonda Hopper
79278f5add [BugFix] EntityList UncaughtException in that.sendUpdate (details below). 
* Adds safety checks to properties.renderInfo to prevent invalid access when undefined.
    * Error trace prior to guards:
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] [defaultScripts.js] [UncaughtException signalHandlerException] Error: Result of expression 'properties.renderInfo' [undefined] is not an object. in .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:93
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] [Backtrace]
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine]     <anonymous>() at .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:93
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine]     <anonymous>(data = [object Object]) at .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:149
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine]     <global>() at -1

Changes Committed:
    modified:   scripts/system/libraries/entityList.js
 2018-04-27 17:23:27 -04:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
vladest
15f8bc0141 Keep old function names for compatibility 2017-08-16 22:17:34 +02:00
vladest
8afdb27c1b Reworked WindowScriptingInterface save method for async methods 2017-08-15 22:55:44 +02:00
Vladyslav Stelmakhovskyi
bcee25acc7 Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated 2017-05-28 19:54:41 +02:00
Stephen Birarda
f64efe18c0 add an isBaked column to edit.js 2017-04-20 14:21:13 -07:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -07:00
Seth Alves
5bff2034c3 cleanups, attempt to get particle explorer to work right 2017-02-22 12:07:18 -08:00
Seth Alves
24fc9bbe67 honor HUDUIEnabled setting 2017-02-09 15:12:01 -08:00
Seth Alves
e12c77e576 move the edit tabs into tablet 2017-02-09 14:43:44 -08:00
Zach Fox
c83cd4a94a Complex checkpoint 2017-01-20 10:24:51 -08:00
howard-stearns
2f5f53c8e4 cr 2017-01-06 10:28:09 -08:00
howard-stearns
83685740c4 change wording for common case 2017-01-05 16:37:40 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
Howard Stearns
12fffe8530 messages 2017-01-04 20:37:56 -08:00