Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 11:32:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25234 commits 75 branches 59 tags 1.2 GiB
Commit graph

25234 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
6337158cfc Fix "simple inline/"direct code injection" entity scripts fail to load" (https://app.asana.com/0/32622044445063/33562012389754) 2015-05-09 13:34:35 -07:00
Howard Stearns
c0a71da9e3 Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting (http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj). 2015-05-09 13:16:34 -07:00
Sam Gateau
23ef568269 fixing file 2015-05-09 11:48:30 -07:00
Sam Gateau
d51904b7b3 fixing file 2015-05-09 11:43:21 -07:00
Sam Gateau
5a11143a5d Using the skybox cubemap for ambient lighting 2015-05-09 11:40:46 -07:00
ZappoMan
0b6a815a20 moved zone stage properties into a group 2015-05-08 20:17:01 -07:00
Stephen Birarda
ebeba81233 make sure an ACM asks for PID in log 2015-05-08 17:37:48 -07:00
Stephen Birarda
be03a65dc7 remember the pid of previous child processes 2015-05-08 17:30:22 -07:00
Stephen Birarda
7b91dbfe07 wait on all children simultaneously 2015-05-08 17:24:20 -07:00
Philip Rosedale
72e1ea688a Merge pull request #4808 from ZappoMan/moreZoneProperties 
add has stars to edit.js & fix background mode: nothing bug
 2015-05-08 17:10:45 -07:00
Stephen Birarda
2916596948 put back call to clearAccessCache 2015-05-08 16:54:35 -07:00
Stephen Birarda
acac2f5a22 don't init if Settings not init 2015-05-08 16:51:27 -07:00
Brad Hefta-Gaub
8d211957e0 Merge pull request #4812 from howard-stearns/edit-script-typo 
Edit script typo
 2015-05-08 16:25:29 -07:00
Brad Hefta-Gaub
a517e773f4 Merge pull request #4786 from ctrlaltdavid/20530 
CR for #20530 - Add DDE calibration
 2015-05-08 16:25:02 -07:00
Stephen Birarda
ddb52348bc don't force use of Settings to all QCoreApplication 2015-05-08 16:24:39 -07:00
Stephen Birarda
83cd50c7ae use waitOnChildren again from checkSpares 2015-05-08 16:24:20 -07:00
Stephen Birarda
ba2ccc1e98 change waitOnChildren syntax in AC monitor 2015-05-08 16:23:44 -07:00
Howard Stearns
abc99267af Typo was making edit.js fail and impossible to debug. 2015-05-08 16:19:39 -07:00
Howard Stearns
37eb455e38 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak 2015-05-08 16:06:53 -07:00
Brad Hefta-Gaub
5bab226d64 Merge pull request #4811 from AndrewMeadows/isothermal 
remove verbose log about failure to build shape
 2015-05-08 15:55:16 -07:00
Brad Hefta-Gaub
bfb2b278ee Merge pull request #4791 from jherico/scale 
Fixing scale resolution issues
 2015-05-08 15:54:24 -07:00
Stephen Birarda
78942b0a87 let QSettings destructor call Setting::Manager sync 2015-05-08 15:49:28 -07:00
Stephen Birarda
637600697b remove ScriptEngine stop completion debug 2015-05-08 15:35:48 -07:00
Stephen Birarda
8359a1a492 add debug for completion of Agent script-engine stop 2015-05-08 15:30:11 -07:00
Stephen Birarda
b5d0a31ad4 remove clear access cache on Agent stop 2015-05-08 15:25:49 -07:00
Stephen Birarda
07d8a6a8ae remove debug for current state of ACM child process 2015-05-08 15:23:22 -07:00
Stephen Birarda
4c93e395ad ask QCoreApplication to quit when PacketTypeStopNode received 2015-05-08 15:22:58 -07:00
Stephen Birarda
fe2775ca94 print out state before wait 2015-05-08 15:10:37 -07:00
Stephen Birarda
15fdcb4fe0 fix non-block, add exit code debug 2015-05-08 15:09:11 -07:00
Stephen Birarda
e092b8c537 give each child one second to clean up 2015-05-08 15:04:54 -07:00
ZappoMan
9f229dc3b3 remove spinners from scatter values 2015-05-08 15:03:04 -07:00
Stephen Birarda
78a1bcdcae add helpful debug for AC monitor cleanup 2015-05-08 15:01:03 -07:00
Stephen Birarda
897ed84cca remove debug calls used to find ACApp stall 2015-05-08 14:56:49 -07:00
Stephen Birarda
8307553d1b don't call exec from ACApp ctor 2015-05-08 14:53:30 -07:00
Stephen Birarda
692c3497cd return the actual exit code from the application 2015-05-08 14:45:46 -07:00
Stephen Birarda
aca71474d8 add debugging to AC monitor to capture hang 2015-05-08 14:43:31 -07:00
Stephen Birarda
0a295bada1 add debugging to catch AC kill hang 2015-05-08 14:32:16 -07:00
Andrew Meadows
a2ffc1029b clear MotionState pointer in body on delete 2015-05-08 14:18:44 -07:00
Andrew Meadows
603afefaab silence verbose no-very-helpful log message 2015-05-08 14:16:38 -07:00
Howard Stearns
447503d4a6 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak 2015-05-08 14:09:47 -07:00
Philip Rosedale
6008713a2a Merge pull request #4809 from PhilipRosedale/master 
don't apply changes to velocity unless needed
 2015-05-08 14:06:51 -07:00
Philip Rosedale
d40e4b7218 don't apply changes to velocity unless needed 2015-05-08 14:05:32 -07:00
ZappoMan
1936f4c114 fix zone:nothing bug 2015-05-08 14:03:58 -07:00
Seth Alves
60d7e622f6 Merge pull request #4805 from PhilipRosedale/master 
Add a delete button to dice script
 2015-05-08 14:02:27 -07:00
Stephen Birarda
99a9f2df90 don't allow an AC monitor to take over other local ACs 2015-05-08 14:02:19 -07:00
ZappoMan
b1d5b2643f add has stars to edit.js 2015-05-08 13:17:39 -07:00
Howard Stearns
ebea754997 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak 2015-05-08 13:04:24 -07:00
Stephen Birarda
df6ee4c7a5 immediately terminate instead of attempting network stop 2015-05-08 12:10:13 -07:00
Stephen Birarda
69143d8677 add a script for server load testing 2015-05-08 11:57:38 -07:00
Stephen Birarda
3d06a86670 drop packets on floor when shutting down 2015-05-08 11:57:25 -07:00