Commit graph

73657 commits

Author SHA1 Message Date
Clement
cc2546d7f2 Switch to GitPython 2019-01-09 18:27:34 -08:00
Clement
d86fcbe5c6 Use argparse instead of the deprecated optparse 2018-11-21 16:57:24 -08:00
Clement
75ac98bd45 Fix tag warning to check the previous version 2018-11-21 16:55:14 -08:00
Clement
dc91b1c915 CR 2018-11-15 18:45:20 -08:00
Stephen Birarda
8b2c9e1c48
Apply suggestions from code review
Changed wording in a few comments

Co-Authored-By: Atlante45 <clement.brisset@gmail.com>
2018-11-15 18:17:08 -08:00
Clement
27ecaeb1b6 Add RC branch creation script 2018-11-15 16:10:51 -08:00
Brad Hefta-Gaub
20766da624
Merge pull request #14382 from dback2/newPropertySliders
Entity properties - new draggable numbers
2018-11-15 10:01:07 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859
Fix Goto app clicks not working
2018-11-15 09:56:56 -08:00
Jamil Akram
60b58977cd
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease
FB17479 - Fix scripted key release events for handshakes.
2018-11-15 09:21:32 -08:00
John Conklin II
ef3acae896
Merge pull request #14407 from jherico/fix/19876
Case 19876: Fix procedurals using the iGlobalTime input
2018-11-14 17:18:57 -08:00
David Back
dfed797682 set more min/max/steps 2018-11-14 15:44:30 -08:00
Brad Davis
b7c567af08 Fix procedurals using the iGlobalTime input 2018-11-14 15:28:22 -08:00
David Back
76d2519205
Merge pull request #14400 from dback2/missingTypeFilters
Add PolyLine/PolyVox to entity list/properties types
2018-11-14 14:39:26 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 14:38:34 -08:00
David Back
d8f5e0f708 add min/max/step for some properties, remove duplicate createProperty, improve switch between states 2018-11-14 14:32:17 -08:00
David Rowe
9c5d318341 Fix highlighting 2018-11-15 10:15:30 +13:00
Brad Hefta-Gaub
6ffee02b4f
Merge pull request #14337 from thoys/feat/create/forwardWindowShortcuts
[CreateApp] make shortcuts work from windows
2018-11-14 12:56:27 -08:00
David Back
cff4c08e9f Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-14 12:46:41 -08:00
Seth Alves
1593c1185a revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it. 2018-11-14 12:29:09 -08:00
David Back
70493e3f29 add polyline/polyvox to entity list/properties types 2018-11-14 12:23:16 -08:00
John Conklin II
92a23ec0a9
Merge pull request #14294 from SimonWalton-HiFi/max-json-size
Allow for large Models.json file
2018-11-14 11:20:35 -08:00
Thijs Wenker
cd12dd8f6d fix OSX shortcut inconsistencies 2018-11-14 19:28:57 +01:00
David Rowe
010f7121a3 Fix Goto app clicks not working
Includes better card highlighting fix.
2018-11-14 15:27:18 +13:00
Simon Walton
452c212c4f Add Paths entry parsing to json parser 2018-11-13 17:58:12 -08:00
David Back
1aa048f4d6 style and decimal fixes 2018-11-13 17:56:31 -08:00
Brad Hefta-Gaub
f1dd778310
Merge pull request #14389 from SimonWalton-HiFi/oven-resourcerequestobserver
Add newly-introduced dependency class to Oven
2018-11-13 17:35:29 -08:00
Simon Walton
82e21e89e4 Merge remote-tracking branch 'upstream/master' into max-json-size 2018-11-13 17:26:20 -08:00
David Back
a349bac01c Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-13 16:32:15 -08:00
Thijs Wenker
2c715bf592 make window shortcuts work on OSX 2018-11-14 01:05:39 +01:00
Thijs Wenker
0248323bee fix test path 2018-11-14 01:05:38 +01:00
Thijs Wenker
cc207537a3 Fix for unintended snapshots while parenting/un-parenting 2018-11-14 01:05:38 +01:00
Thijs Wenker
afd69d04dd Make ctrl+shift shortcuts work for create app 2018-11-14 01:05:37 +01:00
Thijs Wenker
e890228fc7 Make shortcuts work in edit windows 2018-11-14 01:05:36 +01:00
David Back
8db81d9ce6 restructure draggable numbers to be more like blender 2018-11-13 16:04:08 -08:00
John Conklin II
d7dd593a97
Merge pull request #14369 from dback2/entityListColumns
Entity list - dynamic columns
2018-11-13 16:01:06 -08:00
David Back
91db81cd94 merge fix 2018-11-13 15:10:53 -08:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
2018-11-13 15:07:21 -08:00
David Back
c73e737552 Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders 2018-11-13 15:04:12 -08:00
David Back
e88e131dca Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders 2018-11-13 15:04:02 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Jeff Clinton
6c90d7ed11
Merge pull request #14343 from ElderOrb/FB19514
FB19514 - Interface crashes on attempt to apply new animation url via…
2018-11-13 14:59:50 -08:00
Simon Walton
167a8fdc04 Merge branch 'master' into max-json-size 2018-11-13 14:57:06 -08:00
Jamil Akram
d65a79e815
Merge pull request #14377 from huffman/feat/ui-updates
Update the styling for the Entity Properties window
2018-11-13 14:39:57 -08:00
Jeff Clinton
2afc8c505d
Merge pull request #14344 from ElderOrb/FB19348
FB19348 - Interface doesn't save changes to avatar animation text field
2018-11-13 14:29:25 -08:00
Jeff Clinton
18bf6bf975
Merge pull request #14143 from ElderOrb/FB18673
FB18673 - Last line of GOTO desktop notification text cropped off on …
2018-11-13 14:05:21 -08:00
Jamil Akram
822e4bfe48
Merge pull request #14386 from ctrlaltdavid/M19820
Fix entities not loading when Interface doesn't have focus
2018-11-13 13:45:42 -08:00
Ryan Huffman
aecbccc058 Remove dead code and cleanup JS styling for entity properties redesign 2018-11-13 13:45:27 -08:00
Ryan Huffman
8c9015b224 Remove redundant dimensions in default entity properties 2018-11-13 13:45:27 -08:00
Ryan Huffman
536ba645b1 Update the styling for the Entity Properties window 2018-11-13 13:45:27 -08:00
Simon Walton
a65466f154 Use traditional C strings rather than raw strings 2018-11-13 13:33:36 -08:00