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

884 commits

Author SHA1 Message Date
Ryan Huffman
1a2f74f43a Add protection around ScriptEngine::runInThread being called twice 2016-03-22 11:26:10 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
howard-stearns
fce8369708 Remove logging that implies a problem that isn't there. 2016-03-11 14:23:47 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Stephen Birarda
b3d8b67893 remove committed debug lines 2016-03-10 14:50:21 -08:00
Stephen Birarda
c65b5b63f0 better error handling for asset browser 2016-03-10 14:48:44 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
Stephen Birarda
e3cae5b026 change setMapping for new disconnected error case 2016-03-10 12:26:00 -08:00
Stephen Birarda
9c53f40fbe remove nullptr check in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -08:00
Stephen Birarda
fccad7dca4 remove nullptr request checks in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Brad Davis
ee017cf0a5 Make script cache thread safe 2016-03-10 08:47:11 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
Stephen Birarda
6f044e1cd3 handling for leading slashes while loading mappings 2016-03-09 17:36:04 -08:00
Stephen Birarda
ea5349f7a0 remove ctor and dtor for AssetMappingsScriptingInterface 2016-03-09 16:59:31 -08:00
Stephen Birarda
85fe1349eb fix filename in header comment for AssetMappingsScriptingInterface 2016-03-09 16:58:53 -08:00
Ryan Huffman
738ae54e8d Remove comment 2016-03-09 16:56:28 -08:00
Ryan Huffman
fa66c0a521 Remove old model code 2016-03-09 16:44:51 -08:00
Ryan Huffman
3467e06199 Fix bugs in mapping model update 2016-03-09 16:44:41 -08:00
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Ryan Huffman
ebc6c8ce44 Add proper model updating to asset mapping model 2016-03-09 16:29:51 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Stephen Birarda
5a197838f4 add a deleteMapping call for single path to scripting interface 2016-03-09 13:14:39 -08:00
Anthony J. Thibault
deb17e1f93 Merge branch 'master' into tony/hand-controller-move-improvements 2016-03-08 17:45:50 -08:00
Stephen Birarda
8d5111a332 move MappingRequest and subclasses to separate file 2016-03-08 15:30:59 -08:00
Stephen Birarda
181b20f673 move the AssetScriptInterface to script-engine 2016-03-08 14:49:26 -08:00
Stephen Birarda
1ece9aac26 remove extension from asset upload task 2016-03-08 12:08:02 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
Brad Hefta-Gaub
0d48803761 Merge pull request #7236 from howard-stearns/entity-script-safety 
entity script safety
 2016-03-03 17:16:30 -08:00
Howard Stearns
05943ed353 Entity scripts keep of the which entity they are executing for. When the entity goes away, any created timers do, too. Also, loading interface scripts is not allowed from entity scripts. 2016-03-01 16:50:58 -08:00
samcake
630c61e61d Reflection is working correctly with the PBR property, ship t 2016-02-29 18:54:43 -08:00
Zach Pomerantz
95d98e3ed7 Wire up zone ambientURL 2016-02-24 16:07:04 -08:00
Brad Davis
c07f3789e4 Don't crash on script destructor 2016-02-22 14:26:33 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
Howard Stearns
fcdc6dd6fa When we don't make an audo injector (because we're at a limit), make sure the value returned to scripts is null. 2016-02-19 10:54:53 -08:00
Brad Hefta-Gaub
0467930c57 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	examples/controllers/handControllerGrab.js
 2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
Seth Alves
164d5d9c7e try, try again 2016-02-16 01:13:37 -08:00
Seth Alves
f2c9bbc32d filenames on Linux are case-sensitive 2016-02-16 00:39:54 -08:00
Howard Stearns
874f74de04 Fix Quat.lookAt 2016-02-12 10:38:50 -08:00
Stephen Birarda
445662f5ae clean sweep of old now unused audio files 2016-02-08 15:38:12 -08:00
Brad Davis
aa03241dd9 Make all load script dialogs QML and respect previous script location 2016-01-28 15:53:04 -08:00
David Rowe
4e9fc02af5 Fix typos noticed in passing 2016-01-27 08:03:14 +13:00
David Rowe
1bfb941057 Fix Quat.equal() 2016-01-27 08:03:13 +13:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
David Rowe
51cb9dd05e Fix crash in Running Scripts when edit filter after highlighting script 2016-01-16 15:50:33 +13:00
Brad Davis
e8adcd9f1f Fix inability to stop local scripts 2016-01-12 21:11:47 -08:00