Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 03:45:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25201 commits 76 branches 59 tags 1.2 GiB
Commit graph

25201 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Philip Rosedale
671a38beee Merge pull request #4804 from AndrewMeadows/nova 
fix for physics wakeup when moving camera view
 2015-05-08 11:11:26 -07:00
Stephen Birarda
fe1b8cc52b fix entity tree reset / add OST assert for myServer 2015-05-08 11:04:22 -07:00
Stephen Birarda
be58347aec consider assignment completed when worker thread is gone 2015-05-08 10:40:04 -07:00
Clément Brisset
c31363ef51 Merge pull request #4806 from ZappoMan/moreZoneProperties 
set default atmosphere properties to match the default atmosphere
 2015-05-08 19:20:35 +02:00
Stephen Birarda
b080dfc1cf change comment for AC readyRead connect 2015-05-08 10:16:39 -07:00
Stephen Birarda
0f71e93c7f ensure no new OST creation on OctreeServer shutdown 2015-05-08 10:12:14 -07:00
ZappoMan
e8f43c7f4b set default atmosphere properties to match the default atmosphere 2015-05-08 10:03:24 -07:00
Philip Rosedale
de6a63c69a add delete button to clear existing dice 2015-05-08 09:49:58 -07:00
Brad Hefta-Gaub
0e56b49b28 Merge pull request #4803 from Atlante45/edit_js 
Fix OS X shutdown crash
 2015-05-08 09:42:32 -07:00
Stephen Birarda
bab96a7711 more connect call fixes in AssignmentClient 2015-05-08 09:29:29 -07:00
Stephen Birarda
805250d1e1 don't double conditional to fire SN assert 2015-05-08 09:25:44 -07:00
Atlante45
6d0ca40aae Set pointer to nullptr after delete 2015-05-08 18:21:42 +02:00
Andrew Meadows
ada48bcb70 fix for glitchy physics updates 2015-05-08 09:06:31 -07:00
Brad Hefta-Gaub
bbc257199b Merge pull request #4802 from Atlante45/add_debug 
Add some debug to edit.js
 2015-05-08 08:18:45 -07:00
Brad Hefta-Gaub
47630e9a0e Merge pull request #4798 from samcake/blue 
Add the loading of cube map and the rendering of skybox but broken
 2015-05-08 08:13:39 -07:00
Clément Brisset
0e5e6294a5 Merge pull request #4800 from PhilipRosedale/master 
Minor tweak to grab, fix harmonicOscillator sample
 2015-05-08 16:39:31 +02:00
Clément Brisset
55bcb992d9 Merge pull request #4796 from sethalves/fix-octree-max-pps 
Fix octree max pps
 2015-05-08 16:28:42 +02:00
Clément Brisset
cc4ec8edda Merge pull request #4799 from ctrlaltdavid/destroy-trackers 
Delete Leap and RealSense devices on shutdown
 2015-05-08 16:17:00 +02:00
Atlante45
01e3c33bf1 Add some debug to edit.js 2015-05-08 16:13:04 +02:00
Atlante45
52397bf87a Fix wireframe render for meshes with special properties 2015-05-08 15:59:39 +02:00
Philip Rosedale
32dbbbdc8f normalize a vector that needed it. Correct rolloff of grab force 2015-05-07 21:44:09 -07:00
Philip Rosedale
b59352a10e Merge branch 'master' of https://github.com/worklist/hifi 2015-05-07 21:08:06 -07:00
Philip Rosedale
d3a977d3f8 Fix velocity math error, add random color changes 2015-05-07 21:05:13 -07:00
David Rowe
c4e9807259 Merge branch 'master' into 20531 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-05-07 21:01:22 -07:00
Seth Alves
a775c1fb98 Merge pull request #4792 from howard-stearns/objReader-tweak 
Obj reader tweak
 2015-05-07 18:39:37 -07:00
David Rowe
e20df0e2bf Delete Leap and RealSense devices on shutdown 
Leaving them running prevents a clean shutdown on Windows when running
Interface.exe from a command line: the interface.exe process stays alive
preventing Interface from being run again from the command line without
manually terminating the running process.
 2015-05-07 18:28:49 -07:00
Stephen Birarda
3e0029e6e6 use .data on QPointer for slot connection 2015-05-07 17:29:31 -07:00
Sam Gateau
deb303838d Cleaning code 2015-05-07 17:15:45 -07:00
Sam Gateau
351b92627a Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-07 17:06:41 -07:00
Sam Gateau
ce5295a55f THese is not final but we have a basic working framework so let's try to share 2015-05-07 17:06:15 -07:00
Stephen Birarda
a3ce02181e fix ThreadedAssignment setFinished debug 2015-05-07 17:06:09 -07:00
Stephen Birarda
4c8c24eb00 remove an extra debug 2015-05-07 17:04:45 -07:00
Stephen Birarda
d75d204ff6 standardize cleanup of ThreadedAssignments 2015-05-07 17:03:43 -07:00