Stephen Birarda
9b926f6f04
add an hrc with proper resolution for < VC2015
2015-09-14 11:21:08 -07:00
Seth Alves
e65ef93663
Merge pull request #5778 from jherico/homer
...
Fixing some entity race condition crashes
2015-09-11 17:54:53 -07:00
Andrew Meadows
94b0074165
Merge pull request #5765 from ctrlaltdavid/20669-tidy
...
Move cubic interpolation method to shared library
2015-09-11 16:58:22 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
e458eb7ae9
Merge pull request #5734 from sethalves/octree-shared-pointers
...
octree uses shared pointers
2015-09-11 16:00:04 -07:00
Brad Hefta-Gaub
5c6d8da97b
Revert "Make sure all entity script callbacks happen on the Entities script engine thread"
2015-09-11 11:55:36 -07:00
Brad Davis
244795b629
Merge branch 'homer' into temp
...
Conflicts:
interface/src/Application.cpp
2015-09-11 11:21:29 -07:00
Brad Davis
3bc9e8c98d
Fixing some entity race condition crashes
2015-09-10 20:43:41 -07:00
Brad Hefta-Gaub
8eacdbf1c4
first cut at making sure entity scripts are called on the entities script engine thread
2015-09-10 13:02:02 -07:00
David Rowe
016f3964ed
Fix typo
2015-09-10 10:03:27 -07:00
David Rowe
fa959c4554
Move cubic interpolation method to shared library
2015-09-10 08:53:16 -07:00
Howard Stearns
3f5744712f
Remove optional "parent" argument.
...
GenericThread used to accept an optional "parent" argument, defaulting to nullptr.
This was odd, because the moveToThread() in GenericThread::initialize() would
become a no-op if the instance ever inits QObject(someNonNullParentQObject).
(The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent",
and things would end up in the same thread that created the instance.)
As it turns out, all the subclasses of GenericThread do not init
GenericThread(parent), so things worked as expected.
2015-09-09 11:04:17 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
Anthony J. Thibault
3716d5612b
Merge branch 'master' into ajt/new-anim-system
2015-09-03 19:20:06 -07:00
Brad Hefta-Gaub
063320771c
fix a bug in entity script includes and file based includes on windows
2015-09-03 16:37:24 -07:00
Brad Davis
8dc3905767
Add common vector constants to JS, add some missing quaternion functionality
2015-09-03 11:51:35 -07:00
Brad Davis
1f83d04423
Fix oculus crash on switching display plugin to something else
2015-09-02 18:28:43 -07:00
Brad Davis
54b7a063e2
Support HTML colors in overlays
2015-09-02 15:56:37 -07:00
Anthony J. Thibault
d151474446
Merge branch 'master' into ajt/new-anim-system
2015-09-02 10:00:36 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Stephen Birarda
4824b38465
move UUID back to shared
2015-09-01 10:17:07 -06:00
Stephen Birarda
de2bfd0d0d
some QThread cleanup and fix in Socket
2015-08-31 11:30:31 -07:00
Stephen Birarda
fa0abe2972
resolve conflicts on merge with upstream/master
2015-08-31 10:51:12 -07:00
Anthony J. Thibault
54aa0677f6
Merge branch 'master' into ajt/new-anim-system
2015-08-31 10:47:50 -07:00
Brad Davis
08e4fe2dc2
Revert "Add common vector constants to JS"
2015-08-28 16:26:56 -07:00
Brad Hefta-Gaub
1e2374da87
Merge pull request #5677 from jherico/bart
...
Add common vector constants to JS
2015-08-28 13:43:13 -07:00
Brad Davis
2aa1976b5d
Add common vector constants to JS, add some missing quaternionin functionality
2015-08-28 13:05:39 -07:00
Andrew Meadows
614fad0811
remove warnings from linux build
2015-08-27 19:12:25 -07:00
Stephen Birarda
1d6f43e0d0
cleaned up some warnings
2015-08-27 18:26:55 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Brad Hefta-Gaub
79a9694d4a
Merge pull request #5648 from ctrlaltdavid/20663
...
Clean Interface.ini after a crash
2015-08-27 10:52:25 -07:00
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Anthony J. Thibault
b7a9b54628
Better AnimDebugDraw rendering
2015-08-26 16:42:08 -07:00
Brad Davis
270f2f7a3b
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00
Merge pull request #5661 from sethalves/linux-memory-debugger
...
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Anthony J. Thibault
c1333e16ed
Merge branch 'master' into ajt/new-anim-system
2015-08-26 11:59:03 -07:00
Andrew Meadows
f857ccfe16
fix Vectors::MIN
2015-08-26 11:46:50 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
David Rowe
a98a867b06
Delete Interface.ini.lock before accessing to check crash option
2015-08-25 11:07:20 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
David Rowe
f6cf77ae68
Add Developer > Display Crash Options menu item
...
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
2015-08-24 13:24:31 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Stephen Birarda
fd43c48eac
resolve conflicts on merge with birarda/protocol
2015-08-18 11:48:36 -07:00
